summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-08-06 18:39:52 +0100
committerGraham Linden <graham@lindenlab.com>2018-08-06 18:39:52 +0100
commit46c6ead5c3fe87405a644e3167f15b9c6239ee03 (patch)
tree4117fbb6dc9aa7bc198e4796fe2c194b4938df3f /indra/newview/app_settings/settings.xml
parent7da3a1eb4f14b67c698977eb1947ce06a312d507 (diff)
parent057d115ac3de49db0e35066975441e64111c8369 (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 16afdbe9bc..d30657a30a 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3703,13 +3703,13 @@
<key>FeatureManagerHTTPTable</key>
<map>
<key>Comment</key>
- <string>Base directory for HTTP feature/gpu table fetches</string>
+ <string>Deprecated</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>http://viewer-settings.secondlife.com</string>
+ <string></string>
</map>
<key>FPSLogFrequency</key>
<map>
@@ -12302,7 +12302,7 @@
<key>Comment</key>
<string>If TRUE, always load textures at full resolution (discard = 0)</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>