summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-03-11Merge downstream code to 3.7.4simon
2014-03-10DD-17 : WIP : some work on the suffix for Listing foldersMerov Linden
2014-03-10Merge. Refresh from viewer-release after 3.7.3 release.Monty Brandenberg
2014-03-10Pull merge from lindenlab/viewer-releaseMerov Linden
2014-03-10DD-3 : WIP : Add test data to LLMarketplaceData when opening the floater for ↵Merov Linden
the first time
2014-03-10increment viewer version to 3.7.4Oz Linden
2014-03-10Added tag 3.7.3-release for changeset 962d3f98955bOz Linden
2014-03-10MAINT-3703 Suspected thread race crasher in fmodex libraryMonty Brandenberg
Two problems found in DLL involving threads. First, DllMain was reinitializing a critical section for all entry reasons (process attach, detach and thread attach, detach). Should only be done on process attach. Second, static container object was being modified and accessed without serialization. Added some double-check locking to the initialization path to reduce the total number of serialization calls made while making the code thread safe.
2014-03-07Fixes for crash reporter startup race condition, crash reporter CPU use, ↵Aura Linden
Secondlife.log filehandle, XP Crash.
2014-03-07DD-2 : Implement LLMarketplaceTuple and LLMarketplaceDataMerov Linden
2014-03-06DD-7 : Initialize the Merchant Items floater checking the is a Merchant ↵Merov Linden
status correctly. No indication it's initializing (UI) but the code works
2014-03-06DD-4, DD-5, DD-6, DD-7, DD-8: WIP : Add Merchant Items panel and make it ↵Merov Linden
somewhat work, in a clunky sort of way
2014-03-05balance the Object cache trees to delete empty nodes to save memory.Xiaohong Bao
2014-03-04Pull merge from viewer-maint-2287 aka Merchant OutboxMerov Linden
2014-03-03[MAINT-3555][MAINT-3703]Baker Linden
- Removed logging for MAINT-3555 - Added NULL guard to fix MAINT-3703 (hopefully)
2014-02-27Pull merge of codesign workaroundMerov Linden
2014-02-27Merge downstream codesimon
2014-02-27Merge JJ's viewer-release-codesign-workaroundsimon
2014-02-26BUG-4260 Updated to 4.6.x vivox libraries for Mac and Windows.Aura Linden
2014-02-26Fix linux build - make default check in switch statementSimon Linden
2014-02-26fixed mispelling of generateOutgoingAdHocHashRichard Linden
2014-02-26MAINT-3448 FIX: Timestamps disappear from conversation log after viewer restartRichard Linden
2014-02-26Merged lindenlab/viewer-release into defaultJames Johnson
2014-02-26MAINT-3555 FIXED crash in LLPanel::~LLPanel() on shutdown:maksymsproductengine
- LLFloaterView::mToolbarRects[3] was transformed to LLRect mToolbarLeftRect, mToolbarBottomRect, mToolbarRightRect;
2014-02-26MAINT-3555 : crash in LLPanel::~LLPanel() on shutdown. Fixes to be paranoidsimon
about the return type for calls to LLView::getParent(): never assume a down cast is possible.
2014-02-25Merge viewer-releasesimon
2014-02-25mergeBaker Linden
2014-02-25[MAINT-3784] - Viewer takes too long to shut downBaker Linden
- Removed a lot of logging code to reduce application close time
2014-02-25merge viewer-release to sunshine-externalBrad Payne (Vir Linden)
2014-02-24merge with releaseRichard Linden
2014-02-24Pulled from release.obscurestar
2014-02-24Pull merge from viewer-maint-2287Merov Linden
2014-02-24Pull merge from viewer-releaseMerov Linden
2014-02-24increment viewer version to 3.7.3Oz Linden
2014-02-24Added tag 3.7.2-release for changeset b842534cb4d7Oz Linden
2014-02-24MAINT-2588 FIXED User cannot delete items from content of other object, ↵akl
using 'Delete' button on keyboard.
2014-02-25Merge downstream codesimon
2014-02-24mergeBrad Payne (Vir Linden)
2014-02-21changed variable names and errors to more accurately reflect the operation ↵JJ Linden
being performed
2014-02-21Merge downstream codesimon
2014-02-21Merge oz_linden/viewer-fewerpkgssimon
2014-02-20[MAINT-3555] Adding a bajillion log messages to (hopefully) narrow down the ↵Baker Linden
cause of the crash
2014-02-20remove experimental cdn packagesOz Linden
2014-02-20Fix build problemmaksymsproductengine
2014-02-20Fix build problemmaksymsproductengine
2014-02-19duplicated the workaround added for darwin codesigning onto the windos ↵JJ Linden
codesigning
2014-02-19Merge with releaseRichard Linden
2014-02-17Pull merge from lindenlab/viewer-releaseMerov Linden
2014-02-14Merge. Refresh from viewer-release after 3.7.1 release.Monty Brandenberg
2014-02-14increment viewer version to 3.7.2Oz Linden