aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelgeneral.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-06-09 08:35:27 -0700
committerJacek Antonelli2010-06-19 02:43:34 -0500
commitbaf40492a49d3b2da1632204a819015710f9925e (patch)
tree4e498f509a72600830a70fec6f76e48bbef5ee44 /linden/indra/newview/llpanelgeneral.cpp
parentMoved 'Mute wind' into Preferences > Audio, rearranged the audio preferences ... (diff)
downloadmeta-impy-baf40492a49d3b2da1632204a819015710f9925e.zip
meta-impy-baf40492a49d3b2da1632204a819015710f9925e.tar.gz
meta-impy-baf40492a49d3b2da1632204a819015710f9925e.tar.bz2
meta-impy-baf40492a49d3b2da1632204a819015710f9925e.tar.xz
Moved 'Legacy pie menus' into Preferences > Advanced
Diffstat (limited to 'linden/indra/newview/llpanelgeneral.cpp')
-rw-r--r--linden/indra/newview/llpanelgeneral.cpp9
1 files changed, 0 insertions, 9 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 @@
44 44
45#include "llagent.h" 45#include "llagent.h"
46#include "llviewerregion.h" 46#include "llviewerregion.h"
47#include "llviewermenu.h"
48 47
49LLPanelGeneral::LLPanelGeneral() 48LLPanelGeneral::LLPanelGeneral()
50{ 49{
@@ -106,8 +105,6 @@ BOOL LLPanelGeneral::postBuild()
106 105
107 childSetVisible("maturity_desired_combobox", can_choose); 106 childSetVisible("maturity_desired_combobox", can_choose);
108 childSetVisible("maturity_desired_textbox", !can_choose); 107 childSetVisible("maturity_desired_textbox", !can_choose);
109
110 childSetValue("legacy_pie_menu_checkbox", gSavedSettings.getBOOL("LegacyPieEnabled"));
111 108
112 return TRUE; 109 return TRUE;
113} 110}
@@ -159,12 +156,6 @@ void LLPanelGeneral::apply()
159 } 156 }
160 } 157 }
161 158
162 if (gSavedSettings.getBOOL("LegacyPieEnabled") == !((BOOL)childGetValue("legacy_pie_menu_checkbox")))
163 {
164 gSavedSettings.setBOOL("LegacyPieEnabled", childGetValue("legacy_pie_menu_checkbox"));
165 build_pie_menus();
166 }
167
168 // Keep gAllowIdleAFK around for performance reasons -- MC 159 // Keep gAllowIdleAFK around for performance reasons -- MC
169 if (gAllowIdleAFK != (BOOL)childGetValue("afk_timeout_checkbox")) 160 if (gAllowIdleAFK != (BOOL)childGetValue("afk_timeout_checkbox"))
170 { 161 {