diff --git a/linden/indra/newview/llfloaterbuildoptions.cpp b/linden/indra/newview/llfloaterbuildoptions.cpp
index 8c6c5f3d..b6c15b6a 100644
--- a/linden/indra/newview/llfloaterbuildoptions.cpp
+++ b/linden/indra/newview/llfloaterbuildoptions.cpp
@@ -115,6 +115,9 @@ BOOL LLFloaterBuildOptions::postBuild()
 	getChild<LLTextureCtrl>("texture control")->setImageAssetID(LLUUID(gSavedPerAccountSettings.getString("BuildPrefs_Texture")));
 
 	childSetValue("BuildPrefsRenderHighlight_toggle", gSavedSettings.getBOOL("RenderHighlightSelections") );
+	childSetValue("BuildPrefsRenderHidden_toggle", gSavedSettings.getBOOL("RenderHiddenSelections") );
+	childSetValue("BuildPrefsRenderLightRadius_toggle", gSavedSettings.getBOOL("RenderLightRadius") );
+	childSetValue("BuildPrefsShowSelectionBeam_toggle", gSavedSettings.getBOOL("ShowSelectionBeam") );
 	childSetValue("grouplandrez", gSavedSettings.getBOOL("RezWithLandGroup") );
 	childSetValue("GridSubUnit", gSavedSettings.getBOOL("GridSubUnit") );
 	childSetValue("GridCrossSection", gSavedSettings.getBOOL("GridCrossSections") );
@@ -293,6 +296,17 @@ void LLFloaterBuildOptions::apply()
 		LLSelectMgr::sRenderSelectionHighlights = !LLSelectMgr::sRenderSelectionHighlights;
 		gSavedSettings.setBOOL("RenderHighlightSelections", LLSelectMgr::sRenderSelectionHighlights);
 	}
+	if (gSavedSettings.getBOOL("RenderHiddenSelections") != (BOOL)(childGetValue("BuildPrefsRenderHidden_toggle").asBoolean()))
+	{
+		LLSelectMgr::sRenderHiddenSelections = !LLSelectMgr::sRenderHiddenSelections;
+		gSavedSettings.setBOOL("RenderHiddenSelections", LLSelectMgr::sRenderHiddenSelections);
+	}
+	if (gSavedSettings.getBOOL("RenderLightRadius") != (BOOL)(childGetValue("BuildPrefsRenderLightRadius_toggle").asBoolean()))
+	{
+		LLSelectMgr::sRenderLightRadius = !LLSelectMgr::sRenderLightRadius;
+		gSavedSettings.setBOOL("RenderLightRadius", LLSelectMgr::sRenderLightRadius);
+	}
+	gSavedSettings.setBOOL("ShowSelectionBeam", childGetValue("BuildPrefsShowSelectionBeam_toggle").asBoolean() );
 
 	gSavedSettings.setBOOL("RezWithLandGroup", childGetValue("grouplandrez").asBoolean() );
 	gSavedSettings.setBOOL("GridSubUnit", childGetValue("GridSubUnit").asBoolean() );
@@ -340,6 +354,9 @@ void LLFloaterBuildOptions::reset()
 	mBuildTextureUUID = (LLUUID)gSavedPerAccountSettings.getControl("BuildPrefs_Texture")->getDefault().asString();
 
 	childSetValue("BuildPrefsRenderHighlight_toggle", gSavedSettings.getControl("RenderHighlightSelections")->getDefault() );
+	childSetValue("BuildPrefsRenderHidden_toggle", gSavedSettings.getControl("RenderHiddenSelections")->getDefault() );
+	childSetValue("BuildPrefsRenderLightRadius_toggle", gSavedSettings.getControl("RenderLightRadius")->getDefault() );
+	childSetValue("BuildPrefsShowSelectionBeam_toggle", gSavedSettings.getControl("ShowSelectionBeam")->getDefault() );
 	childSetValue("grouplandrez", gSavedSettings.getControl("RezWithLandGroup")->getDefault() );
 	childSetValue("GridSubUnit", gSavedSettings.getControl("GridSubUnit")->getDefault() );
 	childSetValue("GridCrossSection", gSavedSettings.getControl("GridCrossSections")->getDefault() );
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml b/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml
index 53dd217e..5f9e7450 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml
@@ -68,13 +68,34 @@
      label="Values are percent" left_delta="-5" mouse_opaque="true"
      tool_tip="Default settings are Percentages and every axis set at 50"
      name="PivotPercToggle" radio_style="false" width="100" />
-  
-  <check_box bottom_delta="60" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-					 initial_value="true" label="Show selection outlines" left_delta="143"
-					 mouse_opaque="true" name="BuildPrefsRenderHighlight_toggle" 
+
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+					 bottom_delta="-50" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
+					 h_pad="0" halign="left" height="10" left="220" mouse_opaque="false"
+					 name="text_box8" v_pad="0" width="150">Show during build:</text>
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-98" follows="top|left" height="90"
+     left="198" name="ShowBorder" width="135" />
+
+
+  <check_box bottom_delta="70" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+					 initial_value="true" label="Hidden selection" left_delta="0"
+					 mouse_opaque="true" name="BuildPrefsRenderHidden_toggle" 
 					 radio_style="false" width="270"/>
   <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-     label="Limit Select Distance" left_delta="0" mouse_opaque="true"
+					 initial_value="true" label="Light radius" left_delta="0"
+					 mouse_opaque="true" name="BuildPrefsRenderLightRadius_toggle" 
+					 radio_style="false" width="270"/>
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+					 initial_value="true" label="Selection beam" left_delta="0"
+					 mouse_opaque="true" name="BuildPrefsShowSelectionBeam_toggle" 
+					 radio_style="false" width="270"/>
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+					 initial_value="true" label="Selection outlines" left_delta="0"
+					 mouse_opaque="true" name="BuildPrefsRenderHighlight_toggle" 
+					 radio_style="false" width="270"/>
+
+  <check_box bottom_delta="198" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+     label="Limit Select Distance" left_delta="148" mouse_opaque="true"
      tooltip=""
      name="limit_select_dist_check" radio_style="false" width="270" />
   <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 284f1d35..0dcc2d0c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -681,17 +681,17 @@
                   userdata="" />
         <on_check control="RenderLightRadius" />
       </menu_item_check>
-      <menu_item_check label="Show Selection Outlines"
-                       name="Show Selection Outlines">
-        <on_click function="Tools.ShowSelectionHighlights" userdata="" />
-        <on_check control="RenderHighlightSelections" />
-      </menu_item_check>
       <menu_item_check name="Show Selection Beam"
                        label="Show Selection Beam">
         <on_click function="ToggleControl"
                   userdata="ShowSelectionBeam" />
         <on_check control="ShowSelectionBeam" />
       </menu_item_check>
+      <menu_item_check label="Show Selection Outlines"
+                       name="Show Selection Outlines">
+        <on_click function="Tools.ShowSelectionHighlights" userdata="" />
+        <on_check control="RenderHighlightSelections" />
+      </menu_item_check>
     </menu>
     <menu_item_separator />
     <menu_item_check name="Snap to Grid" enabled="false"