Merge LGPL post HTTP merge default tip

Merge sunshine HTTP merge

Merge lgpl http prep backouts

Fix non-standard scroll list color on world map search results. FIRE-11469

Backout 917434682912 and disable dump_syms for x64 again. All version (vc100/vc110 and vc120) are so slow, that they can take hours to complete.

Read MeshMaxConcurrentRequests and Mesh2MaxConcurrentRequests default setting from settings.xml if we reset it due to exceeding the limits

Updated German translation

Clean up merge artifact in settings.xml

Updated Polish translation

FIRE-11451: Cap concurrent mesh requests at a sane value.

Merge http to lgpl

Merge LL 3.7.2

Merge LGPL

Add cache control to GetMesh2

Fixed texture memory bars in texture console

Merge HTTP

Backed out changeset: 71809445e4a8 - prep for http merge

Backed out changeset: f2c6a8ac2edc - prep for http merge

Backed out changeset: 1f6f0608136f - prep for http merge

Backed out changeset: 1765aceeba59 - prep for http merge

Backed out changeset: caf19078a314 - prep for http merge

Backed out changeset: 991c0303923d - prep for http merge

Backed out changeset: 44c45a66bdaf - prep for http merge

merge viewer-release to sunshine-external

increment viewer version to 3.7.3

Added tag 3.7.2-release for changeset b842534cb4d7

Merge. Refresh from viewer-release after 3.7.1 release. 3.7.2-release

Merge. Refresh from viewer-release after 3.7.0 release

Another build trigger

another trigger edit

Trivial edit to stimulate a new build.

Merge. Refresh from viewer-release after 3.6.13 release.

SH-4667 HTTP Viewer reports network error instead of a misnamed joint on mesh upload

Merge. Refresh from viewer-release after 3.6.12 release.

SH-4645 Viewer hangs on exit after cancelling a mesh upload.

Merge. Refresh from lli/monty_viewer-drano-http-3 in preparation for IQA fixes.

Code review updates. All comments so far.

Merge. Refresh from viewer-release after 3.6.11 release.

Merge. Refresh from viewer-release after 3.6.10 release

Merge. Pull in viewer-release after 3.6.8 fixes for AMD graphics.

Convert one more unit test over to improved waiting scheme to avoid build failures.

Merge. Pull in viewer-release after 3.6.7 release.

Up the transfer timeout of small meshes to 120S. This matches

SH-3690 SH-4505 Cleanup pass through code.

Move from std::queue to std::list which has better

Used a c++11 feature unintentionally. Use a more

SH-4516 Fix a subset of thread races in llmeshrepository

Merge. Pull in viewer-release after materials viewer release.

SH-4492 Create a useful README for llcorehttp

SH-4492 Create a useful README for llcorehttp.

SH-4489 New debug/dev settings for control over new mesh behavior

SH-4490 More 'humane' error code presentation from llcorehttp callers

SH-4489 New debug/dev settings for control over new mesh behavior

SH-4478 Corrected/updated error handling for all retrieval operations.

Document the fast timer testing apparatus a bit.

Merge. Pull in monty/viewer-drano-metrics. This will likely be

Add conditional LLFastTimer blocks to stallable main thread methods

Merge. Refresh from viewer-release after SSA.

Merge. Refresh from viewer-release.

Merge. Pull in viewer-release reflecting new release structure.

Merge. Pull in viewer-release after SSA merge.

Okay, move openssl back to the weird 0.9.8/1.0.0 mix it was

Moved OpenSSL to 1.0.1e as an experiement. Can't build llqtwebkit

Automated merge with ssh://hg.lindenlab.com/monty/viewer-drano-http-3

Okay, move openssl back to 0.9.8q as we have compiler issues

Add 'internal'/'external' token to DEBUG retry message so that dev/QA

SH-4407 Tuning to get new code working as well.

SH-4410 Internal Documentation. Update and correct the mutex/data

Create separate high/low water level limits for GetMesh and

SH-4411 Thread/mutex rework between main and worker thread

Added some simple counters to the mesh repository code and then

Change the setting for GetMesh2 meshes to Mesh2MaxConcurrentRequests.

SH-4371 Reduce 22mS inter-connection latency.

Reduce HTTP request retry log spam. Thought I'd done this in an

SH-4371 Reduce 22mS inter-conenction latency on HTTP operations.

SH-4368 Adjust upload timeout parameters for slow networks.

SH-4365 SH-4367 Conversion of mesh uploaders to llcorehttp.

Merge. Refresh from viewer-release.

SH-4325 Viewer working mixed grid with GetMesh and GetMesh2 caps

SH-4312 Configuration data between viewer and llcorehttp is clumsy.

Found the memory corruptor. String trimmer didn't have a valid

Merge. Same repo - mix of windows and linux work.

Update the example program so it handles meshes as well. Fix the

Orphaned declaration preventing compilation.

SH-4312 Clumsy configuration coordination between mesh and corehttp

SH-4257 Prepare for new 'GetMesh2' capability.

SH-4311 Get highwater limiting of requests into llhttpcore working.

SH-4310/BUG-2810/MAINT-2794 Better status checking and error logging in Mesh code.

SH-4257 Preparation for a new cap grant: GetMesh2

Fixups for the transplant of the HttpHeader changes from sunshine.

SH-4106 Significantly upgrade the HttpHeaders interface for SSB.

SH-4252 Add second policy class for large mesh asset downloads

Mostly cleanup. A chunk of comment code nobody needs. Dereference

Merge. Refresh from viewer-release merged with in-progress work.

SH-4184 Conversion to llcorehttp. Remove unneeded responder

Merge. Pull viewer-release to get the new version scheme changes.

SH-4163 Run an initial series of 'B' tests on the mesh downloader code

SH-4139 Convert http downloaders and responders to llcorehttp patterns

SH-4162 Merge metrics repo into this branch and integrate

SH-4161 Integrate cpu metrics into LLDeadmanTimer and then metrics viewer

(0) -30000 -10000 -3000 -1000 -300 -100 tip

mercurial