Merge with siana/future

indra/newview/app_settings/settings.xml

@@ -212,7 +212,7 @@
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
-    <integer>0</integer>
+    <integer>1</integer>
   </map>
   <key>MediaFilterRect</key>
   <map>
@@ -14538,5 +14538,27 @@
       <key>Value</key>
       <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>
+      <string>Random</string>
+    </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>
+      <string>Random</string>
+    </map>
   </map>
 </llsd>