diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-08 10:56:32 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-08 10:56:32 -0400 |
| commit | f30680cce995ff8fd980101f75b8d69377116b7f (patch) | |
| tree | 43acaa3820c9e0d7bfe7ebc297e7b729c62bf604 /indra/newview/app_settings | |
| parent | 09dc3fd81bbd927d389cf8a699bb2dfe67e7b820 (diff) | |
correct merge-induced error in settings.xml
Diffstat (limited to 'indra/newview/app_settings')
| -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 9db59205bf..01842d1037 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12629,21 +12629,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> |