Revert "#1156 Remove Linden Trees and Grass from Build floater"

This reverts commit 1f1e5e3.

Author: marchcat

indra/newview/llfloatertools.cpp

@@ -197,7 +197,9 @@ static  const std::string   toolNames[]={
     "ToolHemiSphere",
     "ToolTorus",
     "ToolTube",
-    "ToolRing"};
+    "ToolRing",
+    "ToolTree",
+    "ToolGrass"};
 LLPCode toolData[]={
     LL_PCODE_CUBE,
     LL_PCODE_PRISM,
@@ -211,7 +213,9 @@ LLPCode toolData[]={
     LL_PCODE_SPHERE_HEMI,
     LL_PCODE_TORUS,
     LLViewerObject::LL_VO_SQUARE_TORUS,
-    LLViewerObject::LL_VO_TRIANGLE_TORUS};
+    LLViewerObject::LL_VO_TRIANGLE_TORUS,
+    LL_PCODE_LEGACY_TREE,
+    LL_PCODE_LEGACY_GRASS};
 
 bool    LLFloaterTools::postBuild()
 {

indra/newview/llfloatertools.h

@@ -169,7 +169,7 @@ class LLFloaterTools
 
     LLButton        *mBtnApplyToSelection;
 
-    std::vector<LLButton*>  mButtons;//[ 13 ];
+    std::vector<LLButton*>  mButtons;//[ 15 ];
 
     LLTabContainer  *mTab;
     LLPanelPermissions      *mPanelPermissions;

indra/newview/lltoolplacer.cpp

@@ -199,8 +199,22 @@ bool LLToolPlacer::rezNewObject(LLPCode pcode, LLViewerObject * hit_obj, S32 hit
     bool            create_selected = false;
     LLVolumeParams  volume_params;
 
+    U8 state = 0;
+
     switch (pcode)
     {
+    case LL_PCODE_LEGACY_GRASS:
+        //  Randomize size of grass patch
+        scale.setVec(10.f + ll_frand(20.f), 10.f + ll_frand(20.f),  1.f + ll_frand(2.f));
+        state = rand() % LLVOGrass::sMaxGrassSpecies;
+        break;
+
+
+    case LL_PCODE_LEGACY_TREE:
+    case LL_PCODE_TREE_NEW:
+        state = rand() % LLVOTree::sMaxTreeSpecies;
+        break;
+
     case LL_PCODE_SPHERE:
     case LL_PCODE_CONE:
     case LL_PCODE_CUBE:
@@ -394,7 +408,7 @@ bool LLToolPlacer::rezNewObject(LLPCode pcode, LLViewerObject * hit_obj, S32 hit
     gMessageSystem->addVector3Fast(_PREHASH_RayEnd,         ray_end_region );
     gMessageSystem->addU8Fast(_PREHASH_BypassRaycast,       (U8)b_hit_land );
     gMessageSystem->addU8Fast(_PREHASH_RayEndIsIntersection, (U8)false );
-    gMessageSystem->addU8Fast(_PREHASH_State, (U8)0 );
+    gMessageSystem->addU8Fast(_PREHASH_State, state);
 
     // Limit raycast to a single object.
     // Speeds up server raycast + avoid problems with server ray hitting objects

indra/newview/skins/default/textures/build/Object_Grass.png

@@ -432,6 +432,8 @@ with the same filename but different name
   <texture name="Object_Cube_Selected" file_name="build/Object_Cube_Selected.png" preload="false" />
   <texture name="Object_Cylinder" file_name="build/Object_Cylinder.png" preload="false" />
   <texture name="Object_Cylinder_Selected" file_name="build/Object_Cylinder_Selected.png" preload="false" />
+  <texture name="Object_Grass" file_name="build/Object_Grass.png" preload="false" />
+  <texture name="Object_Grass_Selected" file_name="build/Object_Grass_Selected.png" preload="false" />
   <texture name="Object_Hemi_Cone" file_name="build/Object_Hemi_Cone.png" preload="false" />
   <texture name="Object_Hemi_Cone_Selected" file_name="build/Object_Hemi_Cone_Selected.png" preload="false" />
   <texture name="Object_Hemi_Cylinder" file_name="build/Object_Hemi_Cylinder.png" preload="false" />
@@ -450,6 +452,8 @@ with the same filename but different name
   <texture name="Object_Tetrahedron_Selected" file_name="build/Object_Tetrahedron_Selected.png" preload="false" />
   <texture name="Object_Torus" file_name="build/Object_Torus.png" preload="false" />
   <texture name="Object_Torus_Selected" file_name="build/Object_Torus_Selected.png" preload="false" />
+  <texture name="Object_Tree" file_name="build/Object_Tree.png" preload="false" />
+  <texture name="Object_Tree_Selected" file_name="build/Object_Tree_Selected.png" preload="false" />
   <texture name="Object_Tube" file_name="build/Object_Tube.png" preload="false" />
   <texture name="Object_Tube_Selected" file_name="build/Object_Tube_Selected.png" preload="false" />
 

indra/newview/skins/default/textures/build/Object_Grass_Selected.png

@@ -94,6 +94,8 @@
 	<button label="" label_selected="" name="ToolTorus" tool_tip="Kuglering"/>
 	<button label="" label_selected="" name="ToolTube" tool_tip="Rør"/>
 	<button label="" label_selected="" name="ToolRing" tool_tip="Ring"/>
+	<button label="" label_selected="" name="ToolTree" tool_tip="Træ"/>
+	<button label="" label_selected="" name="ToolGrass" tool_tip="Græs"/>
 	<check_box label="Hold værktøjet valgt" name="checkbox sticky"/>
 	<check_box label="Kopier valgte" name="checkbox copy selection"/>
 	<check_box initial_value="true" label="Centreret kopi" name="checkbox copy centers"/>

indra/newview/skins/default/textures/build/Object_Tree.png

@@ -94,6 +94,8 @@
 	<button label="" label_selected="" name="ToolTorus" tool_tip="Torus"/>
 	<button label="" label_selected="" name="ToolTube" tool_tip="Rohr"/>
 	<button label="" label_selected="" name="ToolRing" tool_tip="Ring"/>
+	<button label="" label_selected="" name="ToolTree" tool_tip="Baum"/>
+	<button label="" label_selected="" name="ToolGrass" tool_tip="Gras"/>
 	<check_box label="Ausgewähltes Werkzeug beibehalten" name="checkbox sticky"/>
 	<check_box label="Auswahl kopieren" name="checkbox copy selection"/>
 	<check_box initial_value="true" label="Kopie zentrieren" name="checkbox copy centers"/>