summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2014-06-23 18:45:12 -0400
committerMonty Brandenberg <monty@lindenlab.com>2014-06-23 18:45:12 -0400
commitc49ac5ded1168baf3f52586b961f7ed35a8bb999 (patch)
treece5531ee2d2044efbb6a3b382764f16c8b276d9b /indra/newview/app_settings
parent053f436413c01e237accabace4dc5ff1eccca837 (diff)
parent5cca78e718f15522cc3db9aec76aa910dd696aa8 (diff)
Automated merge with ssh://bitbucket.org/monty_linden/viewer-library-refresh
Diffstat (limited to 'indra/newview/app_settings')
-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 7dde3ec84b..4175aac89a 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4467,6 +4467,17 @@
<key>Value</key>
<string />
</map>
+ <key>HttpPipelining</key>
+ <map>
+ <key>Comment</key>
+ <string>If true, viewer will pipeline HTTP requests to servers. Static.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>IMShowTimestamps</key>
<map>
<key>Comment</key>