diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-18 15:41:14 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-18 15:41:14 -0400 |
| commit | 4dc0850da7469906e5ad052da71830b05005295b (patch) | |
| tree | 85a0f05d846ac96800c1ba8980e0711e8a5e337b /indra/newview/app_settings/settings.xml | |
| parent | 4adb212438846af4bdddf8c0389c65924469e55b (diff) | |
| parent | 077bb8b39eda74082f8f83df31b66d10d457b95c (diff) | |
merge changes for storm-1515
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 6fd8588696..58b0879fde 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4894,7 +4894,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <real>20.0</real> + <real>60.0</real> </map> <key>MapOverlayIndex</key> <map> @@ -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 boolean. Set to -1 to defer to built-in default.</string> <key>Persist</key> <integer>0</integer> <key>Type</key> <string>S32</string> <key>Value</key> - <integer>20</integer> + <integer>1</integer> </map> <key>WaterGLFogDensityScale</key> <map> |