From 52025ccb508a574c1f9861b58a289d331d246aba Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 21 Jul 2010 10:25:49 -0700
Subject: Moved Limit Select Distance from the Advanced menu into the Advanced
 Build Options window

---
 linden/indra/newview/llfloaterbuildoptions.cpp                      | 3 +++
 .../indra/newview/skins/default/xui/en-us/floater_build_options.xml | 4 ++++
 linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml        | 6 ------
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/linden/indra/newview/llfloaterbuildoptions.cpp b/linden/indra/newview/llfloaterbuildoptions.cpp
index b6f6158..8c6c5f3 100644
--- a/linden/indra/newview/llfloaterbuildoptions.cpp
+++ b/linden/indra/newview/llfloaterbuildoptions.cpp
@@ -118,6 +118,7 @@ BOOL LLFloaterBuildOptions::postBuild()
 	childSetValue("grouplandrez", gSavedSettings.getBOOL("RezWithLandGroup") );
 	childSetValue("GridSubUnit", gSavedSettings.getBOOL("GridSubUnit") );
 	childSetValue("GridCrossSection", gSavedSettings.getBOOL("GridCrossSections") );
+	childSetValue("limit_select_dist_check", gSavedSettings.getBOOL("LimitSelectDistance") );
 
 	childSetValue("GridResolution", gSavedSettings.getF32("GridResolution") );
 	childSetValue("GridDrawSize", gSavedSettings.getF32("GridDrawSize") );
@@ -296,6 +297,7 @@ void LLFloaterBuildOptions::apply()
 	gSavedSettings.setBOOL("RezWithLandGroup", childGetValue("grouplandrez").asBoolean() );
 	gSavedSettings.setBOOL("GridSubUnit", childGetValue("GridSubUnit").asBoolean() );
 	gSavedSettings.setBOOL("GridCrossSections", childGetValue("GridCrossSection").asBoolean() );
+	gSavedSettings.setBOOL("LimitSelectDistance", childGetValue("limit_select_dist_check").asBoolean() );
 
 	gSavedSettings.setF32("GridResolution", childGetValue("GridResolution").asReal() );
 	gSavedSettings.setF32("GridDrawSize", childGetValue("GridDrawSize").asReal() );
@@ -341,6 +343,7 @@ void LLFloaterBuildOptions::reset()
 	childSetValue("grouplandrez", gSavedSettings.getControl("RezWithLandGroup")->getDefault() );
 	childSetValue("GridSubUnit", gSavedSettings.getControl("GridSubUnit")->getDefault() );
 	childSetValue("GridCrossSection", gSavedSettings.getControl("GridCrossSections")->getDefault() );
+	childSetValue("limit_select_dist_check", gSavedSettings.getControl("LimitSelectDistance")->getDefault() );
 
 	childSetValue("GridResolution", gSavedSettings.getControl("GridResolution")->getDefault() );
 	childSetValue("GridDrawSize", gSavedSettings.getControl("GridDrawSize")->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 80d4524..53dd217 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
@@ -74,6 +74,10 @@
 					 mouse_opaque="true" name="BuildPrefsRenderHighlight_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"
+     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"
      initial_value="false" label="Show axis on root prim" left_delta="0"
      mouse_opaque="true" tool_tip="Default behaviour is to show the axis on the center of mass of a linkset. If enabled, the axis will be shown on the root prim of the linkset instead."
      name="BuildPrefsActualRoot_toggle" radio_style="false" width="270" />
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 e2c2874..b8af8fb 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
@@ -2127,12 +2127,6 @@
       <on_click function="Advanced.CompressImage"
                 userdata="" />
     </menu_item_call>
-    <menu_item_check name="Limit Select Distance"
-                     label="Limit Select Distance">
-      <on_click function="ToggleControl"
-                userdata="LimitSelectDistance" />
-      <on_check control="LimitSelectDistance" />
-    </menu_item_check>
     <menu_item_check name="Disable Max Build Constraints"
            label="Disable Max Build Constraints">
       <on_click function="Advanced.ToggleMaxBuildConstraints"
-- 
cgit v1.1