summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorjenn <jenn@lindenlab.com>2011-07-13 00:16:43 +0000
committerjenn <jenn@lindenlab.com>2011-07-13 00:16:43 +0000
commitf015c073cdbf32d90ff443eec0b31bbd6a94c102 (patch)
treeb0a330af32e5705b8ccc23518699bbef96282221 /indra/newview
parent44c7c6feaa824f4049d326965cb066e76ebefee3 (diff)
Watchdog timeout now set to 60 seconds for long-term use (instead of 20, used during crash pile-on).
Updated setting description field to describe how setting the value of WatchdogEnabled will affect Viewer behavior.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/app_settings/settings.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 4b62e376b5..2bd106a42e 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12578,13 +12578,13 @@
<key>WatchdogEnabled</key>
<map>
<key>Comment</key>
- <string>Controls whether the thread watchdog timer is activated.</string>
+ <string>Controls whether the thread watchdog timer is activated. Value is watchdog timeout in seconds. Set to -1 to disable.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>20</integer>
+ <integer>60</integer>
</map>
<key>WaterGLFogDensityScale</key>
<map>