diff options
| author | jenn <jenn@lindenlab.com> | 2011-07-15 23:39:17 +0000 |
|---|---|---|
| committer | jenn <jenn@lindenlab.com> | 2011-07-15 23:39:17 +0000 |
| commit | 077bb8b39eda74082f8f83df31b66d10d457b95c (patch) | |
| tree | 15ddb088b3aeb956a72f08e09a0bb15d3ce43c70 /indra/newview | |
| parent | fc5aaf5df8d3b064c05539c7b6911a4c3f4dc1c7 (diff) | |
| parent | 86a806137be05b4be812a121fb6dc91dfacd037f (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/newview')
| -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 4b62e376b5..1dfc84a4f7 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> |