summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorjenn <jenn@lindenlab.com>2011-07-15 23:26:19 +0000
committerjenn <jenn@lindenlab.com>2011-07-15 23:26:19 +0000
commit86a806137be05b4be812a121fb6dc91dfacd037f (patch)
treeae28f4cdfd02d0c98c4d2f7efac08ad4c0e18b56 /indra
parentf015c073cdbf32d90ff443eec0b31bbd6a94c102 (diff)
After review and testing, realized that 'WatchdogEnabled' is actually true to its name, and is a boolean, not a timeout value. 'MainloopTimeoutDefault' is the actual timeout value.
Updated descriptions and values accordingly to set Watchdog timeout to 60 seconds.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/app_settings/settings.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 2bd106a42e..1dfc84a4f7 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -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. Value is watchdog timeout in seconds. Set to -1 to disable.</string>
+ <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>60</integer>
+ <integer>1</integer>
</map>
<key>WaterGLFogDensityScale</key>
<map>