summaryrefslogtreecommitdiff
path: root/indra/llmessage
AgeCommit message (Collapse)Author
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-06-20Automated merge with http://bitbucket.org/lindenlab/viewer-releaseDave Parks
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-09Merge downstream code and viewer-betasimon
2013-05-09Merge downstream code / viewer-betasimon
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-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-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)
2013-01-08Automated merge with https://bitbucket.org/lindenlab/viewer-tigerDave Parks
2013-01-08merge changes for DRTVWR-250Oz Linden
2013-01-04merge back DRTVWR-275 from 3.4.4 betaOz Linden
2013-01-03MAINT-2184 [crashhunters] new crash in LLUUID::toStringKelly Washington
Fix dangling references.
2012-12-21MAINT-2168: Backed out changeset fb93eecd462d, reapply fixNat Goodspeed
Now that we've backed out the premature push, reapply the actual fix to propagate it appropriately.
2012-12-21MAINT-2168: Backed out changeset 797318b62275, pushed to wrong repoNat Goodspeed
This changeset was prematurely pushed to the wrong repository. Back it out to propagate it the right way.
2012-12-21MAINT-2168: fail with real message if required var PORT not set.Nat Goodspeed
llhttpclient_test.cpp is only supposed to be run by test_llsdmessage_peer.py, as specified in llmessage/CMakeLists.txt. test_llsdmessage_peer.py sets the environment variable PORT before running INTEGRATION_TEST_llhttpclient. While it's not yet clear under what circumstances INTEGRATION_TEST_llhttpclient could find PORT not set (getenv() returning NULL), it's obvious that in that case, the previous code might well crash. Make it at least fail with an explanatory message rather than a mysterious large negative integer. In theory, occurrences of that message could help us solve the underlying issue.
2012-12-14CHUI-599 : Use the account name in all places that are not UI related but ↵Merov Linden
use avatar names to index, search and other code only uses.
2012-12-07CHUI-580, CHUI-406 : Fixed : Finished avatar name caching, also fixed the ↵Merov Linden
display of (waiting) when names don't come (mostly in legacy mode).
2012-12-07CHUI-580 : Fixed : Clean up the use of display name. Allow the use of the ↵Merov Linden
legacy protocol in settings.xml
2012-12-05CHUI-580 : WIP : Change the display name cache system, deprecating the old ↵Merov Linden
protocol and using the cap (People API) whenever available. Still has occurence of Resident as last name to clean up.
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com