summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r--indra/newview/app_settings/settings.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 34890b23eb..709b4e145c 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12578,13 +12578,21 @@
<key>WatchdogEnabled</key>
<map>
<key>Comment</key>
+<<<<<<< local
+ <string>Controls whether the thread watchdog timer is activated.</string>
+=======
<string>Controls whether the thread watchdog timer is activated. Value is boolean. Set to -1 to defer to built-in default.</string>
+>>>>>>> other
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
+<<<<<<< local
+ <integer>-1</integer>
+=======
<integer>0</integer>
+>>>>>>> other
</map>
<key>WaterGLFogDensityScale</key>
<map>