1 files changed, 8 insertions, 0 deletions

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()