diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 709b4e145c..34890b23eb 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12578,21 +12578,13 @@ <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> |