11 files changed, 172 insertions, 36 deletions

diff --git a/linden/indra/newview/app_settings/grass.xml b/linden/indra/newview/app_settings/grass.xml
index 4fc3b79..bdfa603 100644
--- a/linden/indra/newview/app_settings/grass.xml
+++ b/linden/indra/newview/app_settings/grass.xml
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <grass_defs>
+
   <grass
-    name="Grass 0"
+    name="Grass - Medium"
         species_id="0"
         texture_id="6c4727b8-ac79-ba44-3b81-f9aa887b47eb"
         blade_size_x="1.35"
         blade_size_y="1.35"
      />
   <grass
-    name="Grass 1"
+    name="Grass - Short 2"
         species_id="1"
         texture_id="79504bf5-c3ec-0763-6563-d843de66d0a1"
         blade_size_x="1.0"
         blade_size_y="0.66"
      />
   <grass
-    name="Grass 2"
+    name="Grass - Tall Green"
         species_id="2"
         texture_id="6c4727b8-ac79-ba44-3b81-f9aa887b47eb"
         blade_size_x="1.8"
         blade_size_y="1.8"
      />
   <grass
-    name="Grass 3"
+    name="Grass - Short 1"
         species_id="3"
         texture_id="99bd60a2-3250-efc9-2e39-2fbcadefbecc"
         blade_size_x="1.0"
         blade_size_y="1.0"
      />
   <grass
-    name="Grass 4"
+    name="Grass - Tall Brown"
         species_id="4"
         texture_id="7a2b3a4a-53c2-53ac-5716-aac7d743c020"
         blade_size_x="2.25"
         blade_size_y="2.25"
      />
   <grass
-    name="undergrowth_1"
+    name="Leafy Ground Cover"
         species_id="5"
         texture_id="8f458549-173b-23ff-d4ff-bfaa5ea2371b"
         blade_size_x="2.0"
         blade_size_y="2.0"
      />
 
-
 </grass_defs>
\ No newline at end of file
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index cce09e2..4947c45 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -4236,16 +4236,38 @@
       <string>default</string>
     </map>
     <key>LanguageIsPublic</key>
-        <map>
+    <map>
         <key>Comment</key>
-            <string>Let other residents see our language information</string>
+        <string>Let other residents see our language information</string>
         <key>Persist</key>
-            <integer>1</integer>
+        <integer>1</integer>
         <key>Type</key>
-            <string>Boolean</string>
+        <string>Boolean</string>
         <key>Value</key>
-            <integer>1</integer>
+        <integer>1</integer>
         </map>
+    <key>LastGrass</key>
+    <map>
+    <key>Comment</key>
+        <string>The last grass selected in the create dialog</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>String</string>
+        <key>Value</key>
+        <integer>Random</integer>
+    </map>
+    <key>LastTree</key>
+    <map>
+        <key>Comment</key>
+        <string>The last tree selected in the create dialog</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>String</string>
+        <key>Value</key>
+        <integer>Random</integer>
+    </map>
     <key>LastFeatureVersion</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/app_settings/trees.xml b/linden/indra/newview/app_settings/trees.xml
index 213ee85..36ffa62 100644
--- a/linden/indra/newview/app_settings/trees.xml
+++ b/linden/indra/newview/app_settings/trees.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <tree_defs>
-    <tree name="Pine 1" species_id="0" texture_id="0187babf-6c0d-5891-ebed-4ecab1426683" droop="60.0" twist="5.0" branches="5.0" depth="1" scale_step="0.7" trunk_depth="6" branch_length="8.0" trunk_length="11.5" leaf_scale="22.0" billboard_scale="39.5" billboard_ratio="1.1" trunk_aspect="0.1" branch_aspect="0.05" leaf_rotate="20.0" noise_mag="0.5" noise_scale="2.5" taper="0.8" repeat_z="3" />
+    <tree name="Pine Tree - Ponderosa" species_id="0" texture_id="0187babf-6c0d-5891-ebed-4ecab1426683" droop="60.0" twist="5.0" branches="5.0" depth="1" scale_step="0.7" trunk_depth="6" branch_length="8.0" trunk_length="11.5" leaf_scale="22.0" billboard_scale="39.5" billboard_ratio="1.1" trunk_aspect="0.1" branch_aspect="0.05" leaf_rotate="20.0" noise_mag="0.5" noise_scale="2.5" taper="0.8" repeat_z="3" />
     <tree name="Oak" species_id="1" texture_id="8a515889-eac9-fb55-8eba-d2dc09eb32c8" droop="35.0" twist="3.0" branches="4.0" depth="3" scale_step="0.7" trunk_depth="0" branch_length="3.0" trunk_length="3.8" leaf_scale="7.0" billboard_scale="10.25" billboard_ratio="1.0" trunk_aspect="0.15" branch_aspect="0.07" leaf_rotate="0.0" noise_mag="1.2" noise_scale="4.0" taper="0.3" repeat_z="4" />
-    <tree name="Tropical Bush 1" species_id="2" texture_id="5bc11cd6-2f40-071e-a8da-0903394204f9" droop="10.0" twist="0.0" branches="6.0" depth="1" scale_step="0.5" trunk_depth="1" branch_length="0.5" trunk_length="0.15" leaf_scale="7.5" billboard_scale="5.0" billboard_ratio="1.25" trunk_aspect="1.0" branch_aspect="0.08" leaf_rotate="0.0" noise_mag="1.0" noise_scale="1.0" taper="0.2" repeat_z="1" />
-    <tree name="Palm 1" species_id="3" texture_id="ca4e8c27-473c-eb1c-2f5d-50ee3f07d85c" droop="0.0" twist="0.0" branches="3.0" depth="1" scale_step="0.5" trunk_depth="0" branch_length="0.7" trunk_length="9.0" leaf_scale="10.0" billboard_scale="13.25" billboard_ratio="1.0" trunk_aspect="0.035" branch_aspect="0.03" leaf_rotate="0.0" noise_mag="0.2" noise_scale="6.0" taper="0.7" repeat_z="10" />
-    <tree name="Dogwood" species_id="4" texture_id="64367bd1-697e-b3e6-0b65-3f862a577366" droop="30.0" twist="0.0" branches="3.0" depth="2" scale_step="0.7" trunk_depth="1" branch_length="2.75" trunk_length="4.0" leaf_scale="5.5" billboard_scale="10.0" billboard_ratio="1.0" trunk_aspect="0.06" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="1.5" noise_scale="2.0" taper="0.8" repeat_z="3" />
-    <tree name="Tropical Bush 2" species_id="5" texture_id="cdd9a9fc-6d0b-f90d-8416-c72b6019bca8" droop="10.0" twist="0.0" branches="3.0" depth="1" scale_step="0.5" trunk_depth="1" branch_length="0.5" trunk_length="0.15" leaf_scale="6.0" billboard_scale="4.5" billboard_ratio="0.9" trunk_aspect="1.0" branch_aspect="0.08" leaf_rotate="0.0" noise_mag="1.0" noise_scale="1.0" taper="0.2" repeat_z="1" />
-    <tree name="Palm 2" species_id="6" texture_id="2d784476-d0db-9979-0cff-9408745a7cf3" droop="0.0" twist="0.0" branches="3.0" depth="1" scale_step="0.5" trunk_depth="0" branch_length="0.7" trunk_length="10.0" leaf_scale="7.5" billboard_scale="13.5" billboard_ratio="1.0" trunk_aspect="0.035" branch_aspect="0.03" leaf_rotate="0.0" noise_mag="0.2" noise_scale="6.0" taper="0.6" repeat_z="12" />
-    <tree name="Cypress 1" species_id="7" texture_id="fb2ae204-3fd1-df33-594f-c9f882830e66" droop="30.0" twist="0.0" branches="3.0" depth="4" scale_step="0.5" trunk_depth="0" branch_length="10.0" trunk_length="10.0" leaf_scale="70.0" billboard_scale="22.5" billboard_ratio="1.0" trunk_aspect="0.05" branch_aspect="0.03" leaf_rotate="0.0" noise_mag="1.2" noise_scale="1.0" taper="0.5" repeat_z="6" />
-    <tree name="Cypress 2" species_id="8" texture_id="30047cec-269d-408e-0c30-b2603b887268" droop="30.0" twist="0.0" branches="3.0" depth="4" scale_step="0.6" trunk_depth="3.0" branch_length="7.5" trunk_length="10.0" leaf_scale="35.0" billboard_scale="25.0" billboard_ratio="0.8" trunk_aspect="0.05" branch_aspect="0.04" leaf_rotate="0.0" noise_mag="1.2" noise_scale="1.0" taper="0.5" repeat_z="5" />
-    <tree name="Pine 2" species_id="9" texture_id="d691a01c-13b7-578d-57c0-5caef0b4e7e1" droop="50.0" twist="7.5" branches="4.0" depth="2" scale_step="0.7" trunk_depth="6.0" branch_length="6.0" trunk_length="10.0" leaf_scale="15.5" billboard_scale="33.0" billboard_ratio="1.35" trunk_aspect="0.1" branch_aspect="0.08" leaf_rotate="5.0" noise_mag="0.5" noise_scale="2.5" taper="0.7" repeat_z="3" />
+    <tree name="Tropical Plant 1" species_id="2" texture_id="5bc11cd6-2f40-071e-a8da-0903394204f9" droop="10.0" twist="0.0" branches="6.0" depth="1" scale_step="0.5" trunk_depth="1" branch_length="0.5" trunk_length="0.15" leaf_scale="7.5" billboard_scale="5.0" billboard_ratio="1.25" trunk_aspect="1.0" branch_aspect="0.08" leaf_rotate="0.0" noise_mag="1.0" noise_scale="1.0" taper="0.2" repeat_z="1" />
+    <tree name="Palm Tree 1" species_id="3" texture_id="ca4e8c27-473c-eb1c-2f5d-50ee3f07d85c" droop="0.0" twist="0.0" branches="3.0" depth="1" scale_step="0.5" trunk_depth="0" branch_length="0.7" trunk_length="9.0" leaf_scale="10.0" billboard_scale="13.25" billboard_ratio="1.0" trunk_aspect="0.035" branch_aspect="0.03" leaf_rotate="0.0" noise_mag="0.2" noise_scale="6.0" taper="0.7" repeat_z="10" />
+    <tree name="Dogwood Tree" species_id="4" texture_id="64367bd1-697e-b3e6-0b65-3f862a577366" droop="30.0" twist="0.0" branches="3.0" depth="2" scale_step="0.7" trunk_depth="1" branch_length="2.75" trunk_length="4.0" leaf_scale="5.5" billboard_scale="10.0" billboard_ratio="1.0" trunk_aspect="0.06" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="1.5" noise_scale="2.0" taper="0.8" repeat_z="3" />
+    <tree name="Tropical Plant 2" species_id="5" texture_id="cdd9a9fc-6d0b-f90d-8416-c72b6019bca8" droop="10.0" twist="0.0" branches="3.0" depth="1" scale_step="0.5" trunk_depth="1" branch_length="0.5" trunk_length="0.15" leaf_scale="6.0" billboard_scale="4.5" billboard_ratio="0.9" trunk_aspect="1.0" branch_aspect="0.08" leaf_rotate="0.0" noise_mag="1.0" noise_scale="1.0" taper="0.2" repeat_z="1" />
+    <tree name="Palm Tree 2" species_id="6" texture_id="2d784476-d0db-9979-0cff-9408745a7cf3" droop="0.0" twist="0.0" branches="3.0" depth="1" scale_step="0.5" trunk_depth="0" branch_length="0.7" trunk_length="10.0" leaf_scale="7.5" billboard_scale="13.5" billboard_ratio="1.0" trunk_aspect="0.035" branch_aspect="0.03" leaf_rotate="0.0" noise_mag="0.2" noise_scale="6.0" taper="0.6" repeat_z="12" />
+    <tree name="Cypress Tree 1" species_id="7" texture_id="fb2ae204-3fd1-df33-594f-c9f882830e66" droop="30.0" twist="0.0" branches="3.0" depth="4" scale_step="0.5" trunk_depth="0" branch_length="10.0" trunk_length="10.0" leaf_scale="70.0" billboard_scale="22.5" billboard_ratio="1.0" trunk_aspect="0.05" branch_aspect="0.03" leaf_rotate="0.0" noise_mag="1.2" noise_scale="1.0" taper="0.5" repeat_z="6" />
+    <tree name="Cypress Tree 2" species_id="8" texture_id="30047cec-269d-408e-0c30-b2603b887268" droop="30.0" twist="0.0" branches="3.0" depth="4" scale_step="0.6" trunk_depth="3.0" branch_length="7.5" trunk_length="10.0" leaf_scale="35.0" billboard_scale="25.0" billboard_ratio="0.8" trunk_aspect="0.05" branch_aspect="0.04" leaf_rotate="0.0" noise_mag="1.2" noise_scale="1.0" taper="0.5" repeat_z="5" />
+    <tree name="Pine Tree - Evergreen" species_id="9" texture_id="d691a01c-13b7-578d-57c0-5caef0b4e7e1" droop="50.0" twist="7.5" branches="4.0" depth="2" scale_step="0.7" trunk_depth="6.0" branch_length="6.0" trunk_length="10.0" leaf_scale="15.5" billboard_scale="33.0" billboard_ratio="1.35" trunk_aspect="0.1" branch_aspect="0.08" leaf_rotate="5.0" noise_mag="0.5" noise_scale="2.5" taper="0.7" repeat_z="3" />
     <tree name="Plumeria" species_id="10" texture_id="6de37e4e-7029-61f5-54b8-f5e63f983f58" droop="8.0" twist="7.0" branches="3.0" depth="2" scale_step="0.6" trunk_depth="0" branch_length="3.0" trunk_length="0.1" leaf_scale="20" billboard_scale="10.0" billboard_ratio="1.35" trunk_aspect="0.10" branch_aspect="0.075" leaf_rotate="0.0" noise_mag="0" noise_scale="0" taper="0.85" repeat_z="2" />
-    <tree name="Winter Pine 1" species_id="11" texture_id="10d2a01a-0818-84b9-4b96-c2eb63256519" droop="90.0" twist="2.5" branches="6.0" depth="1" scale_step="0.66" trunk_depth="8" branch_length="0.0" trunk_length="4" leaf_scale="6.75" billboard_scale="12.5" billboard_ratio="0.6" trunk_aspect="0.1" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="0.0" noise_scale="2.5" taper="0.85" repeat_z="2" />
-    <tree name="Winter Aspen" species_id="12" texture_id="7c0cf89b-44b1-1ce2-dd74-07102a98ac2a" droop="85.0" twist="3.0" branches="5" depth="1" scale_step="0.6" trunk_depth="8" branch_length="3.0" trunk_length="4.5" leaf_scale="8" billboard_scale="12" billboard_ratio=".675" trunk_aspect="0.06" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="0.75" noise_scale="2.5" taper="0.8" repeat_z="2" />
-    <tree name="Winter Pine 2" species_id="13" texture_id="67931331-0c02-4876-1255-28770896c6a2" droop="140.0" twist="5.0" branches="6.0" depth="1" scale_step="0.6" trunk_depth="7" branch_length="0.0" trunk_length="3" leaf_scale="5.0" billboard_scale="7.5" billboard_ratio="0.5" trunk_aspect="0.1" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="0.750" noise_scale="2.5" taper="0.5" repeat_z="2" />
-    <tree name="Eucalyptus" species_id="14" texture_id="a6162133-724b-54df-a12f-51cd070ad6f3" droop="20.0" twist="5.0" branches="3.6" depth="4" scale_step="0.6" trunk_depth="0" branch_length="12.0" trunk_length="8.0" leaf_scale="33.0" billboard_scale="24" billboard_ratio="1.3" trunk_aspect="0.15" branch_aspect="0.08" leaf_rotate="0.0" noise_mag="0" noise_scale="0" taper="0.675" repeat_z="3" />
+    <tree name="Winter Pine Tree 1" species_id="11" texture_id="10d2a01a-0818-84b9-4b96-c2eb63256519" droop="90.0" twist="2.5" branches="6.0" depth="1" scale_step="0.66" trunk_depth="8" branch_length="0.0" trunk_length="4" leaf_scale="6.75" billboard_scale="12.5" billboard_ratio="0.6" trunk_aspect="0.1" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="0.0" noise_scale="2.5" taper="0.85" repeat_z="2" />
+    <tree name="Winter Aspen Tree" species_id="12" texture_id="7c0cf89b-44b1-1ce2-dd74-07102a98ac2a" droop="85.0" twist="3.0" branches="5" depth="1" scale_step="0.6" trunk_depth="8" branch_length="3.0" trunk_length="4.5" leaf_scale="8" billboard_scale="12" billboard_ratio=".675" trunk_aspect="0.06" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="0.75" noise_scale="2.5" taper="0.8" repeat_z="2" />
+    <tree name="Winter Pine Tree 2" species_id="13" texture_id="67931331-0c02-4876-1255-28770896c6a2" droop="140.0" twist="5.0" branches="6.0" depth="1" scale_step="0.6" trunk_depth="7" branch_length="0.0" trunk_length="3" leaf_scale="5.0" billboard_scale="7.5" billboard_ratio="0.5" trunk_aspect="0.1" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="0.750" noise_scale="2.5" taper="0.5" repeat_z="2" />
+    <tree name="Eucalyptus Tree" species_id="14" texture_id="a6162133-724b-54df-a12f-51cd070ad6f3" droop="20.0" twist="5.0" branches="3.6" depth="4" scale_step="0.6" trunk_depth="0" branch_length="12.0" trunk_length="8.0" leaf_scale="33.0" billboard_scale="24" billboard_ratio="1.3" trunk_aspect="0.15" branch_aspect="0.08" leaf_rotate="0.0" noise_mag="0" noise_scale="0" taper="0.675" repeat_z="3" />
     <tree name="Fern" species_id="15" texture_id="8872f2b8-31db-42d8-580a-b3e4a91262de" droop="12.0" twist="0.0" branches="7.0" depth="1" scale_step="0.5" trunk_depth="0.1" branch_length="0.01" trunk_length="0.0" leaf_scale="4" billboard_scale="3.5" billboard_ratio="0.85" trunk_aspect="1.0" branch_aspect="0.08" leaf_rotate="0.0" noise_mag="1.0" noise_scale="1.0" taper="0.2" repeat_z="1" />
     <tree name="Eelgrass" species_id="16" texture_id="96b4de31-f4fa-337d-ec78-451e3609769e" droop="0.0" twist="0.0" branches="5.0" depth="1" scale_step="0.5" trunk_depth="1" branch_length="0.5" trunk_length="0.15" leaf_scale="5.0" billboard_scale="3.0" billboard_ratio="1.0" trunk_aspect="1.0" branch_aspect="0.08" leaf_rotate="0.0" noise_mag="1.0" noise_scale="1.0" taper="0.2" repeat_z="1" />
     <tree name="Sea Sword" species_id="17" texture_id="5894e2e7-ab8d-edfa-e61c-18cf16854ba3" droop="0.0" twist="0.0" branches="6.0" depth="1" scale_step="0.7" trunk_depth="1" branch_length="0.0" trunk_length="0.0" leaf_scale="2.0" billboard_scale="2.0" billboard_ratio="1.0" trunk_aspect="1.0" branch_aspect="1.0" leaf_rotate="0.0" noise_mag="0.5" noise_scale="0.0" taper="0.0" repeat_z="1" />
-    <tree name="Kelp 1" species_id="18" texture_id="2caf1179-7861-6ff3-4b7d-46e17780bdfa" droop="-15.0" twist="0.0" branches="1.0" depth="1" scale_step="1.0" trunk_depth="3" branch_length="2.5" trunk_length="0.75" leaf_scale="1.85" billboard_scale="4.9" billboard_ratio="1.0" trunk_aspect="0.04" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="1.0" noise_scale="2.0" taper="0.8" repeat_z="2" />
-    <tree name="Beach Grass 1" species_id="19" texture_id="18fb888b-e8f1-dce7-7da7-321d651ea6b0" droop="0.0" twist="0.0" branches="4.0" depth="1" scale_step="0.7" trunk_depth="1" branch_length="0.0" trunk_length="0.0" leaf_scale="4.0" billboard_scale="2.5" billboard_ratio="1.2" trunk_aspect="1.0" branch_aspect="1.0" leaf_rotate="0.0" noise_mag="0.5" noise_scale="0.0" taper="0.0" repeat_z="1" />
-    <tree name="Kelp 2" species_id="20" texture_id="2a4880b6-b7a3-690a-2049-bfbe38eafb9f" droop="-15.0" twist="0.0" branches="1.0" depth="1" scale_step="1.0" trunk_depth="3" branch_length="2.5" trunk_length="1.35" leaf_scale="2.0" billboard_scale="4.9" billboard_ratio="1.0" trunk_aspect="0.025" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="1.0" noise_scale="2.0" taper="0.8" repeat_z="2" />
+    <tree name="Kelp (brown)" species_id="18" texture_id="2caf1179-7861-6ff3-4b7d-46e17780bdfa" droop="-15.0" twist="0.0" branches="1.0" depth="1" scale_step="1.0" trunk_depth="3" branch_length="2.5" trunk_length="0.75" leaf_scale="1.85" billboard_scale="4.9" billboard_ratio="1.0" trunk_aspect="0.04" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="1.0" noise_scale="2.0" taper="0.8" repeat_z="2" />
+    <tree name="Beach Grass" species_id="19" texture_id="18fb888b-e8f1-dce7-7da7-321d651ea6b0" droop="0.0" twist="0.0" branches="4.0" depth="1" scale_step="0.7" trunk_depth="1" branch_length="0.0" trunk_length="0.0" leaf_scale="4.0" billboard_scale="2.5" billboard_ratio="1.2" trunk_aspect="1.0" branch_aspect="1.0" leaf_rotate="0.0" noise_mag="0.5" noise_scale="0.0" taper="0.0" repeat_z="1" />
+    <tree name="Kelp (green)" species_id="20" texture_id="2a4880b6-b7a3-690a-2049-bfbe38eafb9f" droop="-15.0" twist="0.0" branches="1.0" depth="1" scale_step="1.0" trunk_depth="3" branch_length="2.5" trunk_length="1.35" leaf_scale="2.0" billboard_scale="4.9" billboard_ratio="1.0" trunk_aspect="0.025" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="1.0" noise_scale="2.0" taper="0.8" repeat_z="2" />
 </tree_defs>
diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index e723ba1..2fc4c71 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -77,6 +77,8 @@
 #include "llviewerwindow.h"
 #include "llviewercontrol.h"
 #include "llviewerjoystick.h"
+#include "llvograss.h"
+#include "llvotree.h"
 #include "lluictrlfactory.h"
 
 // Globals
@@ -276,10 +278,14 @@ BOOL	LLFloaterTools::postBuild()
                 {
                         found->setClickedCallback(setObjectType,toolData[t]);
                         mButtons.push_back( found );
-                }else{
+                }
+                else
+                {
                         llwarns << "Tool button not found! DOA Pending." << llendl;
                 }
         }
+        mComboTreesGrass = getChild<LLComboBox>("trees_grass");
+        childSetCommitCallback("trees_grass", onSelectTreesGrass, (void*)0);
         mCheckCopySelection = getChild<LLCheckBoxCtrl>("checkbox copy selection");
         childSetValue("checkbox copy selection",(BOOL)gSavedSettings.getBOOL("CreateToolCopySelection"));
         mCheckSticky = getChild<LLCheckBoxCtrl>("checkbox sticky");
@@ -381,6 +387,7 @@ LLFloaterTools::LLFloaterTools()
         mBtnDuplicate(NULL),
         mBtnDuplicateInPlace(NULL),
 
+        mComboTreesGrass(NULL),
         mCheckSticky(NULL),
         mCheckCopySelection(NULL),
         mCheckCopyCenters(NULL),
@@ -659,6 +666,8 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
 
         mBtnCreate      ->setToggleState(       tool == LLToolCompCreate::getInstance() );
 
+        updateTreeGrassCombo(create_visible);
+
         if (mCheckCopySelection
                 && mCheckCopySelection->get())
         {
@@ -1004,6 +1013,7 @@ void LLFloaterTools::setObjectType( void* data )
         LLPCode pcode = *(LLPCode*) data;
         LLToolPlacer::setObjectType( pcode );
         gSavedSettings.setBOOL("CreateToolCopySelection", FALSE);
+        gFloaterTools->updateTreeGrassCombo(true);
         gFocusMgr.setMouseCapture(NULL);
 }
 
@@ -1026,3 +1036,65 @@ void LLFloaterTools::onFocusReceived()
         LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
         LLFloater::onFocusReceived();
 }
+
+void LLFloaterTools::updateTreeGrassCombo(bool visible)
+{
+        if (visible) 
+        {
+        LLPCode pcode = LLToolPlacer::getObjectType();
+        std::map<std::string, S32>::iterator it, end;
+        std::string selected;
+        if (pcode == LLToolPlacerPanel::sTree) 
+        {
+                selected = gSavedSettings.getString("LastTree");
+                it = LLVOTree::sSpeciesNames.begin();
+                end = LLVOTree::sSpeciesNames.end();
+        } 
+        else if (pcode == LLToolPlacerPanel::sGrass) 
+        {
+                selected = gSavedSettings.getString("LastGrass");
+                it = LLVOGrass::sSpeciesNames.begin();
+                end = LLVOGrass::sSpeciesNames.end();
+        } 
+        else 
+        {
+                mComboTreesGrass->removeall();
+                mComboTreesGrass->setLabel(LLStringExplicit(""));  // LLComboBox::removeall() does not clear the label
+                mComboTreesGrass->setEnabled(false);
+                return;
+        }
+
+        mComboTreesGrass->removeall();
+        mComboTreesGrass->add("Random");
+
+        int select = 0, i = 0;
+
+        while (it != end) 
+        {
+                const std::string &species = it->first;
+                mComboTreesGrass->add(species);  ++i;
+                if (species == selected) select = i;
+                ++it;
+        }
+        // if saved species not found, default to "Random"
+        mComboTreesGrass->selectNthItem(select);
+        mComboTreesGrass->setEnabled(true);
+        }
+        
+        mComboTreesGrass->setVisible(visible);
+}
+
+// static
+void LLFloaterTools::onSelectTreesGrass(LLUICtrl*, void*)
+{
+        const std::string &selected = gFloaterTools->mComboTreesGrass->getValue();
+        LLPCode pcode = LLToolPlacer::getObjectType();
+        if (pcode == LLToolPlacerPanel::sTree) 
+        {
+                gSavedSettings.setString("LastTree", selected);
+        } 
+        else if (pcode == LLToolPlacerPanel::sGrass) 
+        {
+                gSavedSettings.setString("LastGrass", selected);
+        }  
+}
diff --git a/linden/indra/newview/llfloatertools.h b/linden/indra/newview/llfloatertools.h
index 9d555d1..360b1df 100644
--- a/linden/indra/newview/llfloatertools.h
+++ b/linden/indra/newview/llfloatertools.h
@@ -153,6 +153,7 @@ public:
         LLButton        *mBtnDuplicateInPlace;
 
         // Create buttons
+        LLComboBox              *mComboTreesGrass;
         LLCheckBoxCtrl  *mCheckSticky;
         LLCheckBoxCtrl  *mCheckCopySelection;
         LLCheckBoxCtrl  *mCheckCopyCenters;
@@ -194,6 +195,9 @@ private:
         S32                                             mLargeHeight;
 
         std::map<std::string, std::string> mStatusText;
+
+        void updateTreeGrassCombo(bool visible);
+        static void onSelectTreesGrass(LLUICtrl*, void*);
 };
 
 extern LLFloaterTools *gFloaterTools;
diff --git a/linden/indra/newview/lltoolplacer.cpp b/linden/indra/newview/lltoolplacer.cpp
index dda21dd..297556e 100644
--- a/linden/indra/newview/lltoolplacer.cpp
+++ b/linden/indra/newview/lltoolplacer.cpp
@@ -156,6 +156,20 @@ BOOL LLToolPlacer::raycastForNewObjPos( S32 x, S32 y, LLViewerObject** hit_obj,
 }
 
 
+static S32 getTreeGrassSpecies(std::map<std::string, S32> &table, const char *control, S32 max)
+{
+        const std::string &species = gSavedSettings.getString(control);
+        std::map<std::string, S32>::iterator it;
+        it = table.find(species);
+        if (it != table.end()) {
+                return it->second;
+        } else {
+                // if saved species not found, default to "Random"
+                return (rand() % max);
+        }
+}
+
+
 BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
 {
         LLVector3 ray_start_region;
@@ -200,13 +214,13 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
         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;
+                state = getTreeGrassSpecies(LLVOGrass::sSpeciesNames, "LastGrass", LLVOGrass::sMaxGrassSpecies);
                 break;
 
 
         case LL_PCODE_LEGACY_TREE:
         case LL_PCODE_TREE_NEW:
-                state = rand() % LLVOTree::sMaxTreeSpecies;
+                state = getTreeGrassSpecies(LLVOTree::sSpeciesNames, "LastTree", LLVOTree::sMaxTreeSpecies);
                 break;
 
         case LL_PCODE_SPHERE:
diff --git a/linden/indra/newview/llvograss.cpp b/linden/indra/newview/llvograss.cpp
index 4e7816c..79addbb 100644
--- a/linden/indra/newview/llvograss.cpp
+++ b/linden/indra/newview/llvograss.cpp
@@ -71,6 +71,8 @@ F32 w_mod[GRASS_MAX_BLADES];					//  Factor to modulate wind movement by to rand
 LLVOGrass::SpeciesMap LLVOGrass::sSpeciesTable;
 S32 LLVOGrass::sMaxGrassSpecies = 0;
 
+LLVOGrass::SpeciesNames LLVOGrass::sSpeciesNames;
+
 
 LLVOGrass::LLVOGrass(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
 :       LLAlphaObject(id, pcode, regionp)
@@ -201,11 +203,16 @@ void LLVOGrass::initClass()
 
                 if (species >= sMaxGrassSpecies) sMaxGrassSpecies = species + 1;
 
+                std::string name;
+                static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");
+                success &= grass_def->getFastAttributeString(name_string, name);
+                sSpeciesNames[name] = species;
+
                 if (!success)
                 {
-                        std::string name;
+                        /*std::string name;
                         static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");
-                        grass_def->getFastAttributeString(name_string, name);
+                        grass_def->getFastAttributeString(name_string, name);*/
                         llwarns << "Incomplete definition of grass " << name << llendl;
                 }
         }
diff --git a/linden/indra/newview/llvograss.h b/linden/indra/newview/llvograss.h
index 95197a5..de700bd 100644
--- a/linden/indra/newview/llvograss.h
+++ b/linden/indra/newview/llvograss.h
@@ -116,6 +116,9 @@ public:
         F32                                       mBladeWindAngle;
         F32                                       mBWAOverlap;
 
+        typedef std::map<std::string, S32> SpeciesNames;
+        static SpeciesNames sSpeciesNames;
+
 protected:
         ~LLVOGrass();
 
diff --git a/linden/indra/newview/llvotree.cpp b/linden/indra/newview/llvotree.cpp
index 23c92ea..e1c3542 100644
--- a/linden/indra/newview/llvotree.cpp
+++ b/linden/indra/newview/llvotree.cpp
@@ -77,6 +77,9 @@ F32 LLVOTree::sTreeFactor = 1.f;
 LLVOTree::SpeciesMap LLVOTree::sSpeciesTable;
 S32 LLVOTree::sMaxTreeSpecies = 0;
 
+LLVOTree::SpeciesNames LLVOTree::sSpeciesNames;
+
+
 // Tree variables and functions
 
 LLVOTree::LLVOTree(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp):
@@ -230,11 +233,16 @@ void LLVOTree::initClass()
 
                         if (species >= sMaxTreeSpecies) sMaxTreeSpecies = species + 1;
 
+                        std::string name;
+                        static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");
+                        success &= tree_def->getFastAttributeString(name_string, name);
+                        sSpeciesNames[name] = species;
+
                         if (!success)
                         {
-                                std::string name;
-                                static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");
-                                tree_def->getFastAttributeString(name_string, name);
+                                //std::string name;
+                                //static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");
+                                //tree_def->getFastAttributeString(name_string, name);
                                 llwarns << "Incomplete definition of tree " << name << llendl;
                         }
                 }
diff --git a/linden/indra/newview/llvotree.h b/linden/indra/newview/llvotree.h
index f34371e..055cfa3 100644
--- a/linden/indra/newview/llvotree.h
+++ b/linden/indra/newview/llvotree.h
@@ -120,6 +120,9 @@ public:
 
         static F32 sTreeFactor;                 // Tree level of detail factor
 
+        typedef std::map<std::string, S32> SpeciesNames;
+        static SpeciesNames sSpeciesNames;
+
         friend class LLDrawPoolTree;
 protected:
         LLVector3               mTrunkBend;             // Accumulated wind (used for blowing trees)
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index eb9b1c6..6fc5374 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -227,6 +227,9 @@
              image_unselected="object_grass.tga" label="" label_selected=""
              left_delta="23" mouse_opaque="true" name="ToolGrass" scale_image="TRUE"
              tool_tip="Grass" width="24" />
+  <combo_box max_chars="20" enabled="false" allow_text_entry="false" name="trees_grass"
+       height="18" width="135" right="-5" bottom="-122"
+       follows="left|top" mouse_opaque="true" />
         <check_box bottom="-117" control_name="CreateToolKeepSelected" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Keep Tool Selected" left="4" mouse_opaque="true"