Updated to SL source 1.21.2.

Conflicts:
	linden/indra/SConstruct
	linden/indra/newview/files.lst
	linden/indra/newview/llfloatertools.cpp
	linden/indra/newview/llfloatertools.h
	linden/indra/newview/lloverlaybar.cpp
	linden/indra/newview/lloverlaybar.h
	linden/indra/newview/llviewermenu.cpp
	linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
	linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
	linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
	linden/indra/newview/viewer_manifest.py

1 files changed, 12 insertions, 1 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 5543847..17698d7 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -4191,6 +4191,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>LandBrushForce</key>
+    <map>
+      <key>Comment</key>
+      <string>Multiplier for land modification brush force.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>1.0</real>
+    </map>
     <key>Language</key>
     <map>
       <key>Comment</key>
@@ -5607,7 +5618,7 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>RadioLandBrushSize</key>
+    <key>LandBrushSize</key>
     <map>
       <key>Comment</key>
       <string>Size of land modification brush (0 = small, 1 = medium, 2 = large)</string>