summaryrefslogtreecommitdiff
path: root/indra/llmessage
AgeCommit message (Collapse)Author
2013-10-15merge changes for DRTVWR-336Oz Linden
2013-10-04Pull merge of lindenlab/viewer-releaseMerov Linden
2013-08-22merging viewer releaseGilbert Gonzales
2013-08-20merge changes for 3.6.3-releaseOz Linden
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-06-20Automated merge with http://bitbucket.org/lindenlab/viewer-releaseDave Parks
2013-06-19merge changes for 3.6.0-releaseOz Linden
2013-06-19Pull merge from lindenlab/viewer-releaseMerov Linden
2013-06-13merge changes for 3.5.3-releaseOz Linden
2013-06-05Unwind cruft from hunting for 2707 they won't end up in vwr-dev-matGraham Madarasz
2013-06-04BUG-2707 make use of OsOutputDebugString _DEBUG only on Windows to avoid ↵Graham Madarasz
throwing unhandlable exceptions in coroutines in RelWithDebInfo builds
2013-06-03BUG-2707 more logging crash huntingGraham Madarasz
2013-05-30BUG-2707 first learn fly, then learn kick; moved setup of listener to after ↵Graham Madarasz
Area init is complete and made the coro that rewrites URIs do less work on the stack
2013-05-30MATBUG-126 BUG-2707 speculative fix for login crasher based on stack from KatGraham Madarasz
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-05-09Merge downstream code and viewer-betasimon
2013-05-09Merge downstream code / viewer-betasimon
2013-05-08Adding follow_redirects parameter to LLHTTPClient get/head variants. Not ↵Don Kjer
following redirects for facebook connect requests.
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-25Revert ares and libcurl version update that was causing problems, revise curlsimon
handle duplication code. Reviewed by Kelly
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-11Mergesimon
2013-04-11Clean up transfer manager code and log messages. Reviewed by Kellysimon
2013-04-02BUILDFIX commit policy fixesNyx Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-25Pull and merge downstream code with CHUI viewer-development by way of ↵simon
viewer-lion
2013-03-19Merge in viewer-beta to get CHUI codeSimon Linden
2013-03-18merge up to 3.5.0-beta3 (chui)Oz Linden
2013-03-13MAINT-2410 Remove unused particle packing code and fix integration test to ↵Dave Parks
work without a packer.
2013-03-13MergeDave Parks
2013-03-13MAINT-2410 Extra Particle Parameters -- viewer implementationDave Parks
Reviewed by Kelly and Graham
2013-03-13fix for build failureBrad Payne (Vir Linden)
2013-03-13Fixed potential memory leak in LLHTTPClient. Fixed potential hanging http ↵Don Kjer
requests in LLHTTPClient. Fixed munging of "Pragma" headers in LLHTTPClientAdapter
2013-03-12Mods to make compile on gcc 4.6.3 work mo bettaGraham Madarasz
2013-03-11mergeprep
2013-03-11mergeprep
2013-03-11Viewer-chui mergeprep
2013-03-08MAINT-2410 Extra Particle Parameters -- port of Kelly's simulator changesetDave Parks
2013-03-05Fixing issues with not detecting when LLSD XML parsing fails. Changing most ↵Don Kjer
http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam.
2013-02-28Improve curl/ares init behavior by duping handles instead of calling easy_initGraham Madarasz (Graham)
2013-02-11MAINT-2347 Change connect timeout to 30 seconds and request timeout to 4 minutesDave Parks
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2013-01-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2013-01-18merge up to 3.4.4-releaseOz Linden
2013-01-11STORM-1838Jonathan Yap
2013-01-10Merge pull from lindenlab/viewer-betaMerov Linden
2013-01-09viewer-development mergeBaker Linden
2013-01-09[MAINT-2185] Unable to upload terrain .raw filesBaker Linden
- Fixed an issue where a slash was prepended to the beginning of the filename (which happened to be the full path)