From baf40492a49d3b2da1632204a819015710f9925e Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Wed, 9 Jun 2010 08:35:27 -0700 Subject: Moved 'Legacy pie menus' into Preferences > Advanced --- linden/indra/newview/llpanelgeneral.cpp | 9 --------- linden/indra/newview/llprefsadvanced.cpp | 8 ++++++++ .../default/xui/en-us/panel_preferences_advanced.xml | 5 +++++ .../default/xui/en-us/panel_preferences_general.xml | 16 +++------------- 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" /> +