diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-11-11 11:40:19 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-11-11 11:40:19 -0800 |
| commit | 4ea33a3b3cb7fa06cd3f84cbdc866cc8ad9bdefa (patch) | |
| tree | 753588ae96193cf376ec16f759bd12ea4407afdb /indra/newview/app_settings/settings.xml | |
| parent | b31f7381ae85a0aa6c4d9e93b1d8bac5854fdd01 (diff) | |
| parent | 2301cf800f40101baed7a5936683d0b1e4968be1 (diff) | |
Pull merge from lindenlanb/viewer-release
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index dca2062211..287dd5d29e 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> @@ -9489,7 +9511,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>NameTagShowDisplayNames</key> <map> |