summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2018-08-02 21:54:09 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2018-08-02 21:54:09 +0100
commit6ce09ad712f98fe5d0097f1de6a5d1793f5f2bdd (patch)
tree0d4ca8e3d55647d713447b0d865c75565e6458cf /indra/newview/app_settings
parentac889b1eeb7f9a00e7a6d1d9ba14c70d0c7a33fc (diff)
parent09f97172bb478a2c977d8b7b0958196e7e98c433 (diff)
merge
Diffstat (limited to 'indra/newview/app_settings')
-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 4641d5775f..f911008879 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3758,13 +3758,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>
@@ -12335,7 +12335,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>