Moved 'Legacy pie menus' into Preferences > Advanced

4 files changed, 16 insertions, 22 deletions

diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index ecfe6a5..c0b65ce 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -44,7 +44,6 @@
 
 #include "llagent.h"
 #include "llviewerregion.h"
-#include "llviewermenu.h"
 
 LLPanelGeneral::LLPanelGeneral()
 {
@@ -106,8 +105,6 @@ BOOL LLPanelGeneral::postBuild()
         
         childSetVisible("maturity_desired_combobox", can_choose);
         childSetVisible("maturity_desired_textbox",     !can_choose);
-
-        childSetValue("legacy_pie_menu_checkbox", gSavedSettings.getBOOL("LegacyPieEnabled"));
                         
         return TRUE;
 }
@@ -159,12 +156,6 @@ void LLPanelGeneral::apply()
                 }
         }
 
-        if (gSavedSettings.getBOOL("LegacyPieEnabled") == !((BOOL)childGetValue("legacy_pie_menu_checkbox")))
-        {
-                gSavedSettings.setBOOL("LegacyPieEnabled", childGetValue("legacy_pie_menu_checkbox"));
-                build_pie_menus();
-        }
-
         // Keep gAllowIdleAFK around for performance reasons -- MC
         if (gAllowIdleAFK != (BOOL)childGetValue("afk_timeout_checkbox"))
         {
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index d96f97e..22dcbf1 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -33,6 +33,7 @@
 #include "llagent.h"
 #include "llprefsadvanced.h"
 #include "llviewercontrol.h"
+#include "llviewermenu.h"
 #include "llvoavatar.h"
 
 #include "lluictrlfactory.h"
@@ -61,6 +62,7 @@ BOOL LLPrefsAdvanced::postBuild()
         childSetValue("speed_rez_check", gSavedSettings.getBOOL("SpeedRez"));
         childSetValue("speed_rez_interval_spinner", (F32)gSavedSettings.getU32("SpeedRezInterval"));
         childSetValue("appearance_anim_check", gSavedSettings.getBOOL("AppearanceAnimate"));
+        childSetValue("legacy_pie_menu_checkbox", gSavedSettings.getBOOL("LegacyPieEnabled"));
 
         refresh();
 
@@ -121,6 +123,12 @@ void LLPrefsAdvanced::apply()
                 }
         }
         gSavedSettings.setBOOL("ShadowsEnabled", childGetValue("shadows_check").asBoolean());
+
+        if (gSavedSettings.getBOOL("LegacyPieEnabled") == !((BOOL)childGetValue("legacy_pie_menu_checkbox")))
+        {
+                gSavedSettings.setBOOL("LegacyPieEnabled", childGetValue("legacy_pie_menu_checkbox"));
+                build_pie_menus();
+        }
 }
 
 void LLPrefsAdvanced::cancel()
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index 6766cf3..0507a74 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -52,6 +52,11 @@
        tool_tip="Toggle editing animation and standing up when entering appearance mode" 
        label="Animate avatar when editing appearance" left="12" mouse_opaque="true"
        name="appearance_anim_check" radio_style="false" width="217" />
+  <check_box bottom_delta="-25" enabled="true"
+       follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+       label="Use legacy pie menus" left="12"
+       mouse_opaque="true" name="legacy_pie_menu_checkbox" radio_style="false"
+       width="256" />
 
   <button bottom="5" follows="left|top" font="SansSerifSmall" height="20" width="250" 
        label="Reset All Preferences To Default" name="reset_btn" left="12" 
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index 119772d..0ca7b31 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -50,21 +50,11 @@
              font="SansSerifSmall" height="16" initial_value="false"
              label="Hide my group title" left="151" name="show_my_title_checkbox"
              radio_style="false" width="256" />
-  <text type="string" length="1" bottom_delta="-24" follows="left|top" font="SansSerifSmall" h_pad="0"
-       halign="left" height="16" left="10" name="group_titles_textbox" v_pad="0"
-       width="394">
-      Pie Menus:
-  </text>
-  <check_box bottom_delta="0" enabled="true"
-       follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-       label="Use legacy pie menus" left="151"
-       mouse_opaque="true" name="legacy_pie_menu_checkbox" radio_style="false"
-       width="256" />
   <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-210"
              can_apply_immediately="false" color="1 1 1 1"
-             enabled="true" follows="left|top" height="48" label="" left="153"
+             enabled="true" follows="left|top" height="65" label="" left="153"
              mouse_opaque="true" name="effect_color_swatch"
-             tool_tip="Click to open Color Picker" width="32" />
+             tool_tip="Click to open Color Picker" width="55" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-215" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
@@ -150,7 +140,7 @@
                 Nametags:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-184" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-155" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
              mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394">
                 Selection Beam Color: