diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-08 10:08:22 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-08 10:08:22 -0400 |
| commit | 09dc3fd81bbd927d389cf8a699bb2dfe67e7b820 (patch) | |
| tree | e941c78f70c67cdd3a85cb659434e59ff7e59aa0 /indra/newview/app_settings/settings.xml | |
| parent | 33fa30f5261ed73698f65b3da4bef84e666d4db8 (diff) | |
| parent | 8c5da0552db39ba6031b76ffb08994e53217a559 (diff) | |
merge back beta tags
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 01842d1037..9db59205bf 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12629,13 +12629,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> |