diff options
| author | simon <none@none> | 2014-11-03 17:54:24 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-11-03 17:54:24 -0800 |
| commit | fa7610fea599a98cc6e79d3835a14f8e5ca2b6b1 (patch) | |
| tree | 74633f5e484e24b71c563941b37d5843b688d9c3 /indra/newview/app_settings | |
| parent | 4b333e36d1814f1aadf8e57a1810ecdc6a6b9757 (diff) | |
| parent | a669303f8528639b539a793c1dc2d8572beefe80 (diff) | |
Merge downstream code and become 3.7.20
Diffstat (limited to 'indra/newview/app_settings')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 6ac9c161d1..041e802626 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4467,6 +4467,28 @@ <key>Value</key> <string /> </map> + <key>HttpPipelining</key> + <map> + <key>Comment</key> + <string>If true, viewer will attempt to pipeline HTTP requests.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> + <key>HttpRangeRequestsDisable</key> + <map> + <key>Comment</key> + <string>If true, viewer will not issue GET requests with 'Range:' headers for meshes and textures. May resolve problems with certain ISPs and networking gear.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>IMShowTimestamps</key> <map> <key>Comment</key> |