diff -r b39326d4f406 indra/newview/app_settings/settings.xml
--- a/indra/newview/app_settings/settings.xml   Thu Jul 07 13:34:13 2011 -0700
+++ b/indra/newview/app_settings/settings.xml   Mon Jul 18 17:07:31 2011 +0000
@@ -4894,7 +4894,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>20.0</real>
+      <real>60.0</real>
     </map>
     <key>MapOverlayIndex</key>
     <map>
@@ -12578,13 +12578,13 @@
     <key>WatchdogEnabled</key>
     <map>
       <key>Comment</key>
-      <string>Controls whether the thread watchdog timer is activated.</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>S32</string>
-      <key>Value</key>
-      <integer>20</integer>
+      <string>Controls whether the thread watchdog timer is activated. Value is boolean. Set to -1 to defer to built-in default.</string>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>1</integer>
     </map>
     <key>WaterGLFogDensityScale</key>
     <map>