summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-11-13 17:17:41 -0800
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-11-13 17:17:41 -0800
commit76990fab4f3c73ab1b2051421c52444de28f9d32 (patch)
treeaf43dee1ea44dfc900d56607e5195557a439fb3f /indra/newview/app_settings/settings.xml
parent062a4388318de3f9142697d9043143a74ce3aaf8 (diff)
parentbe210914f4e9081f021cc1ad3b671765aba79b61 (diff)
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rwxr-xr-xindra/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 5e42fc29f7..190dd5e2d5 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10789,6 +10789,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>TextureFetchConcurrency</key>
+ <map>
+ <key>Comment</key>
+ <string>Maximum number of HTTP connections used for texture fetches</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>U32</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>TextureFetchDebuggerEnabled</key>
<map>
<key>Comment</key>