summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-07-21 16:26:52 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-07-21 16:26:52 -0400
commitca5bd96bb0d60c795b78c883e91792d4a68ad2c1 (patch)
tree44476d0a8e3cf0f2d32e9d7c9e8ef1c950fae306 /indra/newview/app_settings/settings.xml
parent4311ee30ec52260f38ac20e70a0fc1847cc4b7d0 (diff)
parentd26356d7e16191da90cae23d3871d4e7289e175f (diff)
merge
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r--indra/newview/app_settings/settings.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6ddcec6232..cb83740098 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4872,7 +4872,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string />
+ <string>http://viewer-login.agni.lindenlab.com/</string>
</map>
<key>LosslessJ2CUpload</key>
<map>
@@ -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>
@@ -12623,13 +12623,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>