Age | Commit message (Collapse) | Author | |
---|---|---|---|
2013-05-01 | Merge vwr-dev-mat | Graham Madarasz | |
2013-04-30 | Merge 3.5.1 into Materials | Graham Madarasz | |
2013-04-25 | Revert ares and libcurl version update that was causing problems, revise curl | simon | |
handle duplication code. Reviewed by Kelly | |||
2013-04-19 | merge changes for DRTVWR-294 | Oz Linden | |
2013-04-11 | Merge in downstream code (chui fixes, materials) | simon | |
2013-04-11 | Merge | simon | |
2013-04-11 | Clean up transfer manager code and log messages. Reviewed by Kelly | simon | |
2013-04-02 | BUILDFIX commit policy fixes | Nyx Linden | |
2013-03-29 | Update Mac and Windows breakpad builds to latest | Graham Madarasz | |
2013-03-25 | Pull and merge downstream code with CHUI viewer-development by way of ↵ | simon | |
viewer-lion | |||
2013-03-22 | Automated merge with ↵ | Richard Linden | |
bundle:d:\code\viewer-interesting+c:\users\richard\appdata\local\temp\thg.sp0eps\ssh__richard@hg.lindenlab.com_richard_viewer-interesting-metrics_5o81ck.hg | |||
2013-03-22 | merge with viewer-release | Richard Linden | |
2013-03-19 | Merge in viewer-beta to get CHUI code | Simon Linden | |
2013-03-18 | Merge | Xiaohong Bao | |
2013-03-18 | merge up to 3.5.0-beta3 (chui) | Oz Linden | |
2013-03-13 | MAINT-2410 Remove unused particle packing code and fix integration test to ↵ | Dave Parks | |
work without a packer. | |||
2013-03-13 | Merge | Dave Parks | |
2013-03-13 | MAINT-2410 Extra Particle Parameters -- viewer implementation | Dave Parks | |
Reviewed by Kelly and Graham | |||
2013-03-13 | fix for build failure | Brad Payne (Vir Linden) | |
2013-03-13 | Fixed potential memory leak in LLHTTPClient. Fixed potential hanging http ↵ | Don Kjer | |
requests in LLHTTPClient. Fixed munging of "Pragma" headers in LLHTTPClientAdapter | |||
2013-03-12 | Mods to make compile on gcc 4.6.3 work mo betta | Graham Madarasz | |
2013-03-11 | merge | prep | |
2013-03-11 | merge | prep | |
2013-03-11 | Viewer-chui merge | prep | |
2013-03-08 | MAINT-2410 Extra Particle Parameters -- port of Kelly's simulator changeset | Dave Parks | |
2013-03-06 | renamed LLTrace stat gathering classes/methods to make the structure of ↵ | Richard Linden | |
LLTrace clearer Count becomes CountStatHandle Count.sum becomes sum(Count, value), etc. | |||
2013-03-05 | Fixing 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-28 | for SH-3824: interesting: Ensure viewer can handle object updates from ↵ | Xiaohong Bao | |
entire region gracefully | |||
2013-02-28 | Improve curl/ares init behavior by duping handles instead of calling easy_init | Graham Madarasz (Graham) | |
2013-02-11 | MAINT-2347 Change connect timeout to 30 seconds and request timeout to 4 minutes | Dave Parks | |
2013-01-30 | Pull merge from lindenlab/viewer-developement | Merov Linden | |
2013-01-24 | merging in viewer-beta. | Nyx Linden | |
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh. | |||
2013-01-18 | merge up to 3.4.4-release | Oz Linden | |
2013-01-11 | STORM-1838 | Jonathan Yap | |
2013-01-10 | Merge pull from lindenlab/viewer-beta | Merov Linden | |
2013-01-09 | viewer-development merge | Baker Linden | |
2013-01-09 | [MAINT-2185] Unable to upload terrain .raw files | Baker Linden | |
- Fixed an issue where a slash was prepended to the beginning of the filename (which happened to be the full path) | |||
2013-01-08 | Automated merge with https://bitbucket.org/lindenlab/viewer-tiger | Dave Parks | |
2013-01-08 | merge changes for DRTVWR-250 | Oz Linden | |
2013-01-08 | SH-3468 WIP add memory tracking base class | Richard Linden | |
more fixes for unit test crashes added llcommon initialization/teardown for unit tests that indirectly trigger lltrace changed access of atomic refcount to use preincrement/decrement operators to reflect desired semantics always call apr_initialize in LLCommon::initClass, even if already initialized...apr does internal reference counting to keep things straight | |||
2013-01-06 | SH-3468 WIP add memory tracking base class | Richard Linden | |
fix for unit test failures...cleanup apr without destroying pools, allowing LLProxy to clean itself up as a singleton (and avoiding spurious dependencies associated with manually destorying singletons that rely on apr pools) | |||
2013-01-04 | Automated merge with http://bitbucket.org/lindenlab/viewer-development | Richard Linden | |
2013-01-04 | merge back DRTVWR-275 from 3.4.4 beta | Oz Linden | |
2013-01-03 | MAINT-2184 [crashhunters] new crash in LLUUID::toString | Kelly Washington | |
Fix dangling references. | |||
2013-01-03 | SH-3406 WIP convert fast timers to lltrace system | Richard Linden | |
made fast timer stack thread local added LLThreadLocalSingleton made LLThreadLocalPointer obey pointer rules for const added LLThreadLocalSingletonPointer for fast thread local pointers | |||
2012-12-21 | MAINT-2168: Backed out changeset fb93eecd462d, reapply fix | Nat Goodspeed | |
Now that we've backed out the premature push, reapply the actual fix to propagate it appropriately. | |||
2012-12-21 | MAINT-2168: Backed out changeset 797318b62275, pushed to wrong repo | Nat Goodspeed | |
This changeset was prematurely pushed to the wrong repository. Back it out to propagate it the right way. | |||
2012-12-21 | MAINT-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-14 | CHUI-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-07 | CHUI-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). |