diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6fe9d4c961..f16a09c062 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3,6 +3,18 @@
   xsi:noNamespaceSchemaLocation="llsd.xsd">
 <map>
 
+  <key>AvatarSitOnAway</key>
+    <map>
+      <key>Comment</key>
+      <string>Sit down when marked AFK</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+
   <key>ShowViewerIDsOnNameTag</key>
     <map>
       <key>Comment</key>
@@ -12,7 +24,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <string>1</string>
+      <integer>1</integer>
     </map>
 
   <key>PhoenixOOCPrefix</key>
@@ -48,7 +60,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <string>1</string>
+      <integer>1</integer>
     </map>  
 
   <key>ShowScriptDialogsTopRight</key>
@@ -7053,19 +7065,7 @@ Change of this parameter will affect the layout of buttons in notification toast
       <integer>0</integer>
     </map>
 
-    <key>QuitAfterSecondsOfAFK</key>
-    <map>
-      <key>Comment</key>
-      <string>The duration allowed after being AFK before quitting.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>1800.0</real>
-    </map>
-
-    <key>QuitAfterSeconds</key>
+   <key>QuitAfterSeconds</key>
     <map>
       <key>Comment</key>
       <string>The duration allowed before quitting.</string>
@@ -7074,8 +7074,9 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>0.0</real>
+      <real>-1.0</real>
     </map>
+
     <key>QuitAfterSecondsOfAFK</key>
     <map>
       <key>Comment</key>
@@ -7085,8 +7086,9 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>0.0</real>
+      <real>1800</real>
     </map>
+
     <key>QuitOnLoginActivated</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 3ab4648ee5..01e8e37ea0 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -1176,7 +1176,7 @@ void LLAgent::setAFK()
 
 	if (!(mControlFlags & AGENT_CONTROL_AWAY))
 	{
-		llinfos << "AFK DEBUG: Setting AFK" << llendl;
+		llinfos << "Setting AFK" << llendl;
 		sendAnimationRequest(ANIM_AGENT_AWAY, ANIM_REQUEST_START);
 		setControlFlags(AGENT_CONTROL_AWAY | AGENT_CONTROL_STOP);
 		gAwayTimer.start();
@@ -1184,6 +1184,14 @@ void LLAgent::setAFK()
 		{
 			gAFKMenu->setLabel(LLTrans::getString("AvatarSetNotAway"));
 		}
+
+		// <AO> Gsit on away, antigrief protection
+		if (gSavedSettings.getBOOL("AvatarSitOnAway") == TRUE)
+		{
+			if (!gAgentAvatarp->isSitting() && !gRlvHandler.hasBehaviour(RLV_BHVR_SIT))
+    				gAgent.sitDown();
+		}
+		// </AO>
 	}
 }
 
@@ -1206,6 +1214,15 @@ void LLAgent::clearAFK()
 		{
 			gAFKMenu->setLabel(LLTrans::getString("AvatarSetAway"));
 		}
+
+                // <AO> if we sat while away, stand back up on clear
+                if (gSavedSettings.getBOOL("AvatarSitOnAway") == TRUE)
+                {
+                        if (gAgentAvatarp->isSitting() && !gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT))
+                                gAgent.standUp();
+                }
+		// </AO>
+
 	}
 }
 
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 913b55501e..a56e6c31c9 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -188,7 +188,7 @@
      layout="topleft"
      name="start_location_combo"
      left="35"
-     width="100">
+     width="150">
         <combo_box.item
          label="My Last Location"
          name="MyLastLocation"
@@ -204,7 +204,7 @@
      initial_value="true"
      label="Show on login"
      layout="topleft"
-     left_pad="5"
+     left_pad="20"
      name="show_location_checkbox"
      top_delta="5"
      width="256" />
@@ -351,23 +351,23 @@
       follows="left|top"
       height="13"
       layout="topleft"
-      left_pad="50"
+      left_pad="5"
       top_delta="0"
       name="title_afk_quit_text" 
       width="190">
-    Log out after being away:
+    Log out after being marked away:
     </text>
-
+    
   <combo_box
             height="23"
             layout="topleft"
             control_name="AFKTimeout"
-            left="35"
+            left="25"
             top_pad="10"
             label="Away timeout:"
             top_delta="0"
             name="afk"
-            width="150">
+            width="120">
     <combo_box.item
      label="2 minutes"
      name="item0"
@@ -394,11 +394,14 @@
             height="23"
             layout="topleft"
             control_name="QuitAfterSecondsOfAFK"
-            left_pad="70"
+            left_pad="30"
             top_delta="0"
-            label="Logout after being away:"
             name="quitafk"
-            width="150">
+            width="120">
+    <combo_box.item
+     label="Immediately"
+     name="item5"
+     value="0" />
     <combo_box.item
      label="2 minutes"
      name="item0"
@@ -418,9 +421,20 @@
     <combo_box.item
      label="Never Logout"
      name="item4"
-     value="0" />
+     value="999999999" />
   </combo_box>
   
+      <check_box
+        control_name="AvatarSitOnAway"
+        name="AvatarSitOnAway"
+        follows="top|left"
+        height="16"
+        label="Sit when away"
+        layout="topleft"
+        left_pad="50"
+        top_delta="5"
+        width="50"/>
+        
     <text
      type="string"
      length="1"
@@ -430,7 +444,7 @@
      left="30"
      mouse_opaque="false"
      name="text_box3"
-     top_pad="10"
+     top_pad="20"
      width="400">
        Autoresponse response (for busy and autorespond online status):
     </text>
@@ -444,6 +458,7 @@
      height="42"
      layout="topleft"
      left="50"
+     top_pad="10"
      name="busy_response"
      width="450"
      word_wrap="true">