diff options
| author | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-11-11 03:50:38 +0200 |
|---|---|---|
| committer | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-11-11 03:50:38 +0200 |
| commit | 7894a0bb9a72f1e910157d4ac50047b7e894d5e2 (patch) | |
| tree | 23fdbd8be092d8d347afdd0f40bad561ef8baaf2 /indra/newview/app_settings | |
| parent | f9d82b83a894418090fdf4268401c73fb632f2ef (diff) | |
| parent | 2301cf800f40101baed7a5936683d0b1e4968be1 (diff) | |
merge changes with 3.7.20-release
Diffstat (limited to 'indra/newview/app_settings')
| -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 1eec89e111..61ab7c1715 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4489,6 +4489,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> @@ -9500,7 +9522,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>NameTagShowDisplayNames</key> <map> |