summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2011-07-19 15:06:56 -0400
committerLogan Dethrow <log@lindenlab.com>2011-07-19 15:06:56 -0400
commit0f501293bdf5498369e5b6e4409cfdc758366d9e (patch)
treee8cd32ff25f2ef00d43a69491a37a3b59f169e85 /indra/newview/app_settings/settings.xml
parent792667ff8ef13e16823d96b490ea9a4f498425ea (diff)
parent4dc0850da7469906e5ad052da71830b05005295b (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 55bab3064f..11a4e204af 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4927,7 +4927,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string />
+ <string>http://viewer-login.agni.lindenlab.com/</string>
</map>
<key>LosslessJ2CUpload</key>
<map>
@@ -4949,7 +4949,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>20.0</real>
+ <real>60.0</real>
</map>
<key>MapOverlayIndex</key>
<map>
@@ -12633,13 +12633,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>