diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-09-05 17:37:21 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-09-05 17:37:21 -0400 |
| commit | ee4cd594623eff6f04cfc2bafb937f0cfd631080 (patch) | |
| tree | 7d3a8770fca691abc66a910ea64dc79a28ef46f6 /indra/newview/llappcorehttp.cpp | |
| parent | bbf9de9c6717f38a77a39d42d8493d275d558db9 (diff) | |
| parent | 0c20beda6800149ee71a307ca4e943b5bba56908 (diff) | |
Merge. Refresh from viewer-drano-http-4 after pipelining work.
Diffstat (limited to 'indra/newview/llappcorehttp.cpp')
| -rwxr-xr-x | indra/newview/llappcorehttp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llappcorehttp.cpp b/indra/newview/llappcorehttp.cpp index 2b7d91b5ff..f5f224b83e 100755 --- a/indra/newview/llappcorehttp.cpp +++ b/indra/newview/llappcorehttp.cpp @@ -65,12 +65,12 @@ static const struct "texture fetch" }, { // AP_MESH1 - 32, 1, 128, 100, false, + 32, 1, 128, 0, false, "MeshMaxConcurrentRequests", "mesh fetch" }, { // AP_MESH2 - 8, 1, 32, 100, true, + 8, 1, 32, 0, true, "Mesh2MaxConcurrentRequests", "mesh2 fetch" }, |