Applied patch by Armin Weatherwax for #79: move AllowIdleAFK from advanced to Preferences > General

2 files changed, 4 insertions, 7 deletions

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 @@
       <!-- CHARACTER TESTS -->
       <menu name="Character Tests" drop_shadow="true"
             opaque="true" tear_off="true">
-        <menu_item_check name="Go Away/AFK When Idle"
-                         label="Go Away/AFK When Idle">
-          <on_click function="Advanced.ToggleAllowIdleAFK"
-                    userdata="" />
-          <on_check function="Advanced.CheckAllowIdleAFK"
-                    userdata="" />
-        </menu_item_check>
         <menu_item_call name="Appearance To XML"
                         label="Appearance To XML">
           <on_click function="Advanced.ToggleAppearanceToXML"
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 263a9e9..db7e487 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
@@ -83,6 +83,10 @@
              font="SansSerifSmall" height="16" initial_value="false"
              label="Use resolution independent scale" left="151" mouse_opaque="true"
              name="ui_auto_scale" radio_style="false" width="256" />
+  <check_box bottom="-260" enabled="true" follows="left|top"
+                   font="SansSerifSmall" height="16" initial_value="false"
+                   label="Go Away/AFK When Idle" left="330" mouse_opaque="true"
+                   name="afk_timeout_checkbox" radio_style="false" width="256" />
   <spinner bottom="-260" decimal_digits="0" enabled="true"
              follows="left|top" height="16" increment="1" initial_val="300"
              label="Away Timeout:" label_width="141" left="10" max_val="600"