Commit Graph

905 Commits (94ac0064354594de8adbb99084029c8b4027b2f6)

Author SHA1 Message Date
Aura Linden 3d4acb535d Appears to fix MAINT-4184 2014-07-22 17:24:00 -07:00
Oz Linden e15002a11c merge changes for 3.7.9-release 2014-06-16 11:42:37 -04:00
Ricky Curtice 98720c3cec Merge 2014-06-05 06:31:30 -07:00
Stinson Linden 8392fde6f6 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365. 2014-06-02 22:32:16 +01:00
Brad Payne (Vir Linden) 67051b26ba merge 2014-05-19 18:10:45 -04:00
Stinson Linden babd89b770 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2014-05-19 22:19:55 +01:00
Brad Payne (Vir Linden) 7f3e1b7313 merge fix 2014-05-16 13:28:22 -04:00
Brad Payne (Vir Linden) 487ca1bad3 v-r -> s-e merge WIP 2014-05-14 17:50:59 -04:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
simon 250db74bf9 Pull and merge viewer-release as version 3.7.8 2014-05-07 10:56:41 -07:00
Oz Linden a98b4b6bee merge changes for 3.7.7-release 2014-05-07 11:09:04 -04:00
Stinson Linden 582c10cc47 MAINT-4009: Ensuring to delete array data with the array delete in the RawInjector destructor. 2014-04-25 23:30:53 +01:00
Stinson Linden fd0e84296e MAINT-4009: Cleaning up the curl easy handle during shutdown. 2014-04-23 19:36:08 +01:00
Stinson Linden 5e225213f6 MAINT-4009: Adding an ares cleanup call to free the allocated memory. 2014-04-23 17:57:23 +01:00
Oz Linden 776aadf4ef OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBS 2014-03-19 17:30:07 -04:00
Brad Payne (Vir Linden) d9e3a2948a merge 2014-03-12 17:24:07 -04:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
simon 6f1df3172e Merge viewer-release 2014-02-25 16:45:19 -08:00
Brad Payne (Vir Linden) 895d52a399 merge viewer-release to sunshine-external 2014-02-25 13:25:40 -05:00
Richard Linden 80b4a4a1f5 merge with release 2014-02-24 18:45:59 -08:00
simon dd8b32473e Merge downstream code 2014-02-25 16:47:31 -08:00
maksymsproductengine 1033c9d67f MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:
- memory leaks fixing;
2014-02-05 20:45:09 +02:00
simon 52ce788d0c Pull in viewer-lion to lock down next release 2014-02-18 16:41:21 -08:00
simon 38915f119c More memory cleanup of containers after DeletePairedPointer() usage. 2014-02-14 14:57:08 -08:00
Baker Linden d7b902d575 [MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown
- Added clear() after DeletePointer() call to hopfully fix this...
2014-02-14 13:56:36 -08:00
maksymsproductengine e6c85c46c4 MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:
- memory leaks fixing;
2014-02-05 20:45:09 +02:00
MaximB ProductEngine 2a1098552e MAINT-3541 (crash in std::vector >::reserve) 2013-12-12 07:24:13 +02:00
MaximB ProductEngine f3a50a5084 MAINT-3541 (crash in std::vector >::reserve) 2013-12-12 07:24:13 +02:00
Brad Payne (Vir Linden) 9acc630010 fix for license wording 2013-12-10 16:25:37 -05:00
simon 5bef957159 MAINT-3530 : Add viewer checkbox to extend parcel entry limits to a higher ceiling 2013-12-06 15:44:18 -08:00
Monty Brandenberg b2d769534c Code review updates. All comments so far. 2013-11-18 13:33:19 -05:00
Monty Brandenberg d191585a3e Merge. Refresh from viewer-release after 3.6.10 release 2013-11-12 14:06:38 -05:00
maksymsproductengine 241259820c MAINT-3269 FIXED crash in LLMessageSystem::callExceptionFunc 2013-11-12 20:05:45 +02:00
Richard Linden fe518bde8e merge with release 2013-11-06 17:22:04 -08:00
Mnikolenko ProductEngine aaf6c7954d MAINT-3374 FIXED Don't show username after display name if this setting is disabled. 2013-11-06 11:42:48 +02:00
Don Kjer 7866356d77 Merge viewer-release => sunshine-internal 2013-10-29 13:20:18 +00:00
Xiaohong Bao 555cf227ff trivial: fix several weird compiling errors. 2013-10-25 10:29:45 -06:00
Richard Linden 318a1eca57 more buildfix stuff 2013-10-21 11:24:35 -07:00
Brad Payne (Vir Linden) 1f8b37e9ad merge 2013-10-16 11:52:43 -04:00
Richard Linden 697d2e720b renamed TimeBlock to BlockTimerStatHandle 2013-10-15 20:24:42 -07:00
Oz Linden 9c313aea13 merge changes for DRTVWR-336 2013-10-15 17:47:37 -04:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Monty Brandenberg 6f5790da38 Merge. Pull in viewer-release after 3.6.7 release. 2013-10-04 15:36:52 -04:00
Merov Linden 1e32b9dd33 Pull merge of lindenlab/viewer-release 2013-10-04 09:47:26 -07:00
Monty Brandenberg 200bea5b41 SH-3690 SH-4505 Cleanup pass through code.
Start using DNS cache in legacy LLCurl code.  Go to 15 seconds
particularly as we're using threaded resolver at this point.
Documentation cleanup.  Add libcurl status checking and logging
for curl_easy_setopt() operations that fail.  Shouldn't happen
and we'll just continue anyway but there's info in the logs to
track these down now.  Cleaned up logic around FASTTIMER enable
defines used to evaluate pipeline stalls in main thread.
Removed long-standing thread race around caps strings and
URL construction.  Not a significant risk but refactoring the
code to get rid of them removed one huge eyesore.  It can be
made even slicker if desired (see notes).
2013-09-24 14:49:26 -04:00
Richard Linden cbe397ad13 changed fast timer over to using macro
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
Richard Linden a7aed07a5b broke out llunit.h into llunittype.h and llunits.h for unit declarations
changed unit declarations macros to make a lot more sense
2013-08-27 13:41:19 -07:00
Gilbert Gonzales a8d5b070b0 merging viewer release 2013-08-22 14:58:10 -07:00
Brad Payne (Vir Linden) a3b1a60ed7 merge 2013-08-22 16:12:40 -04:00
Oz Linden c42a91421f merge changes for 3.6.3-release 2013-08-20 10:37:10 -04:00