From 0a77162d93c07ec0918251686f6b4050bd0b5c55 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sat, 5 Jun 2010 03:31:21 -0700 Subject: Applied patch by Armin Weatherwax for #79: move AllowIdleAFK from advanced to Preferences > General --- linden/indra/newview/app_settings/settings.xml | 2 +- linden/indra/newview/llappviewer.cpp | 2 -- linden/indra/newview/llpanelgeneral.cpp | 8 +++++++ linden/indra/newview/llviewermenu.cpp | 27 +--------------------- .../skins/default/xui/en-us/menu_viewer.xml | 7 ------ .../xui/en-us/panel_preferences_general.xml | 4 ++++ 6 files changed, 14 insertions(+), 36 deletions(-) diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 85665cf..7ce768b 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml @@ -1171,7 +1171,7 @@ Type Boolean Value - 1 + 0 AllowMultipleViewers diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 821742c..bedb2a0 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp @@ -2307,8 +2307,6 @@ void LLAppViewer::cleanupSavedSettings() gSavedSettings.setBOOL("UseEnergy", TRUE); // force toggle to turn off, since sends message to simulator gSavedSettings.setBOOL("DebugWindowProc", gDebugWindowProc); - - gSavedSettings.setBOOL("AllowIdleAFK", gAllowIdleAFK); gSavedSettings.setBOOL("AllowTapTapHoldRun", gAllowTapTapHoldRun); gSavedSettings.setBOOL("ShowObjectUpdates", gShowObjectUpdates); diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp index 3e2a048..ecfe6a5 100644 --- a/linden/indra/newview/llpanelgeneral.cpp +++ b/linden/indra/newview/llpanelgeneral.cpp @@ -65,6 +65,7 @@ BOOL LLPanelGeneral::postBuild() childSetValue("small_avatar_names_checkbox", gSavedSettings.getBOOL("SmallAvatarNames")); childSetValue("show_my_title_checkbox", gSavedSettings.getBOOL("RenderHideGroupTitle")); childSetValue("afk_timeout_spinner", gSavedSettings.getF32("AFKTimeout")); + childSetValue("afk_timeout_checkbox", gSavedSettings.getBOOL("AllowIdleAFK")); childSetValue("mini_map_notify_chat", gSavedSettings.getBOOL("MiniMapNotifyChatRange")); childSetValue("mini_map_notify_sim", gSavedSettings.getBOOL("MiniMapNotifySimRange")); @@ -129,6 +130,7 @@ void LLPanelGeneral::apply() gSavedSettings.setBOOL("SmallAvatarNames", childGetValue("small_avatar_names_checkbox")); gSavedSettings.setBOOL("RenderHideGroupTitle", childGetValue("show_my_title_checkbox")); gSavedSettings.setF32("AFKTimeout", childGetValue("afk_timeout_spinner").asReal()); + gSavedSettings.setBOOL("AllowIdleAFK", childGetValue("afk_timeout_checkbox")); gSavedSettings.setBOOL("MiniMapNotifyChatRange", childGetValue("mini_map_notify_chat")); gSavedSettings.setBOOL("MiniMapNotifySimRange", childGetValue("mini_map_notify_sim")); gSavedSettings.setColor4("EffectColor", childGetValue("effect_color_swatch")); @@ -162,6 +164,12 @@ void LLPanelGeneral::apply() 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")) + { + gAllowIdleAFK = childGetValue("afk_timeout_checkbox"); + } } void LLPanelGeneral::cancel() diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index f97fffd..ff6b7eb 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp @@ -1351,8 +1351,6 @@ void init_debug_avatar_menu(LLMenuGL* menu) menu->appendMenu(sub_menu); sub_menu = new LLMenuGL("Character Tests"); - sub_menu->append(new LLMenuItemToggleGL("Go Away/AFK When Idle", - &gAllowIdleAFK)); sub_menu->append(new LLMenuItemCallGL("Appearance To XML", &LLVOAvatar::dumpArchetypeXML)); @@ -9839,28 +9837,7 @@ class LLAdvancedEnableGrabBakedTexture : public view_listener_t // ALLOW IDLE / AFK // ////////////////////// - -class LLAdvancedToggleAllowIdleAFK : public view_listener_t -{ - bool handleEvent(LLPointer event, const LLSD& userdata) - { - gAllowIdleAFK = !(gAllowIdleAFK); - return true; - } -}; - -class LLAdvancedCheckAllowIdleAFK : public view_listener_t -{ - bool handleEvent(LLPointer event, const LLSD& userdata) - { - bool new_value = gAllowIdleAFK; - std::string control_name = userdata["control"].asString(); - gMenuHolder->findControl(control_name)->setValue(new_value); - return true; - } -}; - - +//aw: moved to llpanelgeneral.cpp /////////////////////// // APPEARANCE TO XML // @@ -11101,8 +11078,6 @@ void initialize_menus() addMenu(new LLAdvancedEnableGrabBakedTexture(), "Advanced.EnableGrabBakedTexture"); // Advanced > Character > Character Tests - addMenu(new LLAdvancedToggleAllowIdleAFK(), "Advanced.ToggleAllowIdleAFK"); - addMenu(new LLAdvancedCheckAllowIdleAFK(), "Advanced.CheckAllowIdleAFK"); addMenu(new LLAdvancedAppearanceToXML(), "Advanced.AppearanceToXML"); addMenu(new LLAdvancedToggleCharacterGeometry(), "Advanced.ToggleCharacterGeometry"); addMenu(new LLAdvancedTestMale(), "Advanced.TestMale"); 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 d5d21fb..f27c341 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 @@ -1773,13 +1773,6 @@ - - - - +