summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-06-21 11:51:06 +0300
committerMike Antipov <mantipov@productengine.com>2010-06-21 11:51:06 +0300
commit26fe6e1df5371e889e9c0c5d0b6eba086ba1c7ac (patch)
tree57c181955f356118b0622ecc9c5c132d092b6a4c /indra/newview/app_settings
parentca816088999d130b2f36a287b1d33d02cea6ce30 (diff)
parentff2c3873817c6ab701483dbdda656af5e038f0a6 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 2244f05104..1d635ef18a 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2841,6 +2841,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>FeatureManagerHTTPTable</key>
+ <map>
+ <key>Comment</key>
+ <string>Base directory for HTTP feature/gpu table fetches</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>String</string>
+ <key>Value</key>
+ <string>http://viewer-settings.secondlife.com</string>
+ </map>
<key>FPSLogFrequency</key>
<map>
<key>Comment</key>