1 files changed, 11 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 000c63d22c..1a8a6ee23d 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4,13 +4,13 @@
     <key>AFKTimeout</key>
     <map>
       <key>Comment</key>
-      <string>Time before automatically setting AFK (away from keyboard) mode (seconds)</string>
+      <string>Time before automatically setting AFK (away from keyboard) mode (seconds, 0=never)</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <real>300.0</real>
+      <real>0</real>
     </map>
     <key>AdvanceSnapshot</key>
     <map>
@@ -197,7 +197,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>1.0</real>
+      <real>0.5</real>
     </map>
     <key>AudioLevelMic</key>
     <map>
@@ -219,7 +219,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>1.0</real>
+      <real>0.5</real>
     </map>
     <key>AudioLevelRolloff</key>
     <map>
@@ -241,7 +241,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>1.0</real>
+      <real>0.5</real>
     </map>
     <key>AudioLevelUI</key>
     <map>
@@ -4328,13 +4328,13 @@
     <key>LoginLocation</key>
     <map>
       <key>Comment</key>
-      <string>Login at same location you last logged out</string>
+      <string>Login location ('last', 'home')</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>last</string>
+      <string>home</string>
     </map>
     <key>LoginPage</key>
     <map>
@@ -4598,7 +4598,7 @@
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
-    <integer>0</integer>
+    <integer>1</integer>
   </map>
   <key>MediaShowWithinParcel</key>
   <map>
@@ -5360,7 +5360,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>PerAccountSettingsFile</key>
     <map>
@@ -5554,7 +5554,7 @@
 	<key>PreferredMaturity</key>
     <map>
       <key>Comment</key>
-      <string>Setting for the user's preferred maturity level.</string>
+      <string>Setting for the user's preferred maturity level (consts in indra_constants.h)</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -10114,7 +10114,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>UseFreezeFrame</key>
     <map>