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, 2 insertions, 2 deletions

diff --git a/linden/indra/newview/lltoolbrush.cpp b/linden/indra/newview/lltoolbrush.cpp
index 0869cf3..214d773 100644
--- a/linden/indra/newview/lltoolbrush.cpp
+++ b/linden/indra/newview/lltoolbrush.cpp
@@ -96,7 +96,7 @@ LLToolBrushLand::LLToolBrushLand()
         mGotHover(FALSE),
         mBrushSelected(FALSE)
 {
-        mBrushIndex = gSavedSettings.getS32("RadioLandBrushSize");
+        mBrushIndex = gSavedSettings.getS32("LandBrushSize");
 }
 
 void LLToolBrushLand::modifyLandAtPointGlobal(const LLVector3d &pos_global,
@@ -447,7 +447,7 @@ void LLToolBrushLand::render()
                         spot.mdV[VX] = floor( spot.mdV[VX] + 0.5 );
                         spot.mdV[VY] = floor( spot.mdV[VY] + 0.5 );
 
-                        mBrushIndex = gSavedSettings.getS32("RadioLandBrushSize");
+                        mBrushIndex = gSavedSettings.getS32("LandBrushSize");
                         region_list_t regions;
                         determineAffectedRegions(regions, spot);