diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 3f0df18..83f50fa 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -64,7 +64,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>AllowMultipleViewers</key>
     <map>
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index 6166ba5..63c4606 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -42,6 +42,7 @@
 
 // project includes
 #include "llagent.h"
+#include "llappviewer.h"
 #include "llviewerwindow.h"
 #include "llcolorswatch.h"
 #include "llcombobox.h"
@@ -150,9 +151,7 @@ BOOL LLPanelGeneral::postBuild()
 	
 	childSetCommitCallback("language_combobox", set_language );
 	childSetValue("language_combobox", 	gSavedSettings.getString("Language"));
-
 	refresh();
-
 	return TRUE;
 }
 
@@ -199,6 +198,7 @@ void LLPanelGeneral::refresh()
 	mRenderHideGroupTitle = gSavedSettings.getBOOL("RenderHideGroupTitle");
 	mChatOnlineNotification = gSavedSettings.getBOOL("ChatOnlineNotification");
 	mAFKTimeout = gSavedSettings.getF32("AFKTimeout");
+	mAllowIdleAFK = gSavedSettings.getBOOL("AllowIdleAFK");
 	mMiniMapRotate = gSavedSettings.getBOOL("MiniMapRotate");
 	mMiniMapTeleport = gSavedSettings.getBOOL("MiniMapTeleport");
 	mNotifyMoney = gSavedSettings.getBOOL("NotifyMoneyChange");
@@ -208,12 +208,13 @@ void LLPanelGeneral::refresh()
 
 	mUIScaleFactor = gSavedSettings.getF32("UIScaleFactor");
 	mUIAutoScale = gSavedSettings.getBOOL("UIAutoScale");
-
 	mLanguage = gSavedSettings.getString("Language");
+
 }
 
 void LLPanelGeneral::apply()
-{
+{ 
+	gAllowIdleAFK = gSavedSettings.getBOOL("AllowIdleAFK");
 }
 
 void LLPanelGeneral::cancel()
@@ -224,6 +225,7 @@ void LLPanelGeneral::cancel()
 	gSavedSettings.setBOOL("RenderHideGroupTitle", mRenderHideGroupTitle );
 	gSavedSettings.setBOOL("ChatOnlineNotification", mChatOnlineNotification );
 	gSavedSettings.setF32("AFKTimeout", mAFKTimeout );
+	gSavedSettings.setBOOL("AllowIdleAFK", mAllowIdleAFK );
 	gSavedSettings.setBOOL("MiniMapRotate", mMiniMapRotate );
 	gSavedSettings.setBOOL("MiniMapTeleport", mMiniMapTeleport);
 	gSavedSettings.setBOOL("NotifyMoneyChange", mNotifyMoney );
@@ -233,9 +235,8 @@ void LLPanelGeneral::cancel()
 	gSavedSettings.setF32("UIScaleFactor", mUIScaleFactor);
 	gSavedSettings.setBOOL("UIAutoScale", mUIAutoScale);
 	gSavedSettings.setString("Language", mLanguage);
-	
-	LLURLSimString::setString(mLoginLocation);
 
+	LLURLSimString::setString(mLoginLocation);
 	gCrashSettings.setS32(CRASH_BEHAVIOR_SETTING, mOldCrashBehavior);
 }
 
diff --git a/linden/indra/newview/llpanelgeneral.h b/linden/indra/newview/llpanelgeneral.h
index 00dc874..44182e9 100644
--- a/linden/indra/newview/llpanelgeneral.h
+++ b/linden/indra/newview/llpanelgeneral.h
@@ -66,6 +66,7 @@ protected:
 	BOOL mChatOnlineNotification;
 	BOOL mShowSearch;
 	F32 mAFKTimeout;
+	BOOL mAllowIdleAFK;
 	BOOL mNotifyMoney;
 	BOOL mUseDefaultColor;
 	LLColor4 mEffectColor;
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 982f5aa..2f0687f 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -1352,8 +1352,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));
@@ -8947,28 +8945,7 @@ class LLAdvancedEnableGrabBakedTexture : public view_listener_t
 // ALLOW IDLE / AFK //
 //////////////////////
 
-
-class LLAdvancedToggleAllowIdleAFK : public view_listener_t
-{
-	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-	{
-		gAllowIdleAFK = !(gAllowIdleAFK);
-		return true;
-	}
-};
-
-class LLAdvancedCheckAllowIdleAFK : public view_listener_t
-{
-	bool handleEvent(LLPointer<LLEvent> 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 //
@@ -10086,8 +10063,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 5513add..3621abd 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
@@ -1679,13 +1679,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 8bf6d9c..bb8fc44 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
@@ -76,6 +76,10 @@
 	     follows="left|top" height="16" increment="1" initial_val="300"
 	     label="Away Timeout:" label_width="141" left="10" max_val="600"
 	     min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
+	<check_box bottom="-260" control_name="AllowIdleAFK" enabled="true" follows="left|top"
+		   font="SansSerifSmall" height="16" initial_value="false"
+		   label="Go Away/AFK When Idle" left="280" mouse_opaque="true"
+		   name="AllowIdleAFK" radio_style="false" width="256" />
 	<check_box bottom="-286" control_name="MiniMapRotate" enabled="true" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false"
 	     label="Rotate Mini-Map" left="151" mouse_opaque="true"