diff options
author | Richard Nelson <richard@lindenlab.com> | 2011-07-26 15:38:37 -0700 |
---|---|---|
committer | Richard Nelson <richard@lindenlab.com> | 2011-07-26 15:38:37 -0700 |
commit | 2c2a4c123eb9bfa80785e5509e73c8f7f236228f (patch) | |
tree | 83160657e9c42e9dc78f6be455f254671429bc9c /indra/newview/app_settings/settings.xml | |
parent | 74b6f5dce31b5ff69ced8e1e8cd37e4c5ded2943 (diff) | |
parent | 95da8c81f3d5afd8d888589398028883e6647333 (diff) |
merge
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 916f376c4c..2b4c460da5 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4863,7 +4863,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string /> + <string>http://viewer-login.agni.lindenlab.com/</string> </map> <key>LosslessJ2CUpload</key> <map> @@ -4885,7 +4885,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <real>20.0</real> + <real>60.0</real> </map> <key>MapOverlayIndex</key> <map> @@ -12573,13 +12573,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> |