summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Collapse)Author
2014-03-25Pull merge from lindenlab/viewer-releaseMerov Linden
2014-03-13DD-42 : Rename merchant items to marketplace listings to be consistent with specMerov Linden
2014-03-10Pull merge from lindenlab/viewer-releaseMerov Linden
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-04Pull merge from viewer-maint-2287 aka Merchant OutboxMerov Linden
2014-02-25Merge viewer-releasesimon
2014-02-24Pull merge from viewer-releaseMerov Linden
2014-02-20Fix build problemmaksymsproductengine
2014-02-05MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:maksymsproductengine
- memory leaks fixing;
2014-02-14More memory cleanup of containers after DeletePairedPointer() usage.simon
2014-02-14[MAINT-3555] Crash in LLPanel::~LLPanel() on shutdownBaker Linden
- Added clear() after DeletePointer() call to hopfully fix this...
2013-12-05Merge. Refresh from lli/monty_viewer-drano-http-3 in preparation for IQA fixes.Monty Brandenberg
2013-11-25Merge. Refresh from viewer-release after 3.6.11 release.Monty Brandenberg
2013-11-25Merge - doh!simon
2013-11-21Pull merge from lindenlab/viewer-releaseMerov Linden
2013-11-18Pull merge from lindenlab/viewer-releaseMerov Linden
2013-11-18Code review updates. All comments so far.Monty Brandenberg
2013-11-12Merge. Refresh from viewer-release after 3.6.10 releaseMonty Brandenberg
2013-11-11Merge 3.6.11 for RC-abilityGraham Linden
2013-11-06MAINT-3374 FIXED Don't show username after display name if this setting is ↵Mnikolenko ProductEngine
disabled.
2013-10-25Fix release merge issues (included upstream changes not yet in release from ↵Graham Linden
bear)
2013-10-25Merge 3.6.9 ShareStormGraham Linden
2013-10-14Pull merge with lindenlab/viewer-bearMerov Linden
2013-10-14Pull merge from lindenlab/viewer-releaseMerov Linden
2013-10-04Merge. Pull in viewer-release after 3.6.7 release.Monty Brandenberg
2013-10-03merge changes for 3.6.7-releaseOz Linden
2013-09-19Merge. Pull in viewer-release after materials viewer release.Monty Brandenberg
2013-09-18merge changes for 3.6.6-releaseOz Linden
2013-09-10remove llversionviewer.h (incorrectly re-created in a merge)Oz Linden
2013-09-09Merge downstream code with viewer-releasesimon_linden
2013-09-09Merge viewer-release 3.6.5 CocoaGraham Linden
2013-09-09Merge viewer-releasesimon
2013-08-27MAINT-3065 : Avatar render info's 'geometry' stat is unpredictable for ↵simon
linked objects Removed "geometry" and "surface" Reviewed by Kelly
2013-08-27merge changes for 3.6.4-releaseOz Linden
2013-08-26Merge. Pull in viewer-release after SSA merge.Monty Brandenberg
2013-08-26Merge the CHUIstorm 3.6.5Graham Linden
2013-08-26Tweak MAINT-3046 fix for faster remove_() performancesimon
2013-08-23MAINT-3046 fix test regression from debug llassert accidentally checked in ↵Graham Linden
with crash fix
2013-08-23MAINT-3046 make LLNotifications clear out vecs of LLNotificationChannelPtr ↵Graham Madarasz (Graham Linden)
so singleton cleanup doesn't do things it really ought not do
2013-08-27Merge downstream codesimon_linden
2013-08-26Merge downstream code for CHUIStormsimon
2013-08-22MAINT-2850 Fix for linux builddmitry
2013-08-21Merge downstream code, including viewer-releasesimon
2013-08-21Fix file EOL formatSimon Linden
2013-08-20MAINT-2850 FIXED Windows 8.1 detected as running in windows 8 compatibility ↵dmitrykproductengine
mode always
2013-08-20MAINT-3005 FIXED Set max persistent notifications to reduce log-in timemaxim@mnikolenko
2013-10-23Merge latest viewer-release with FBCsimon
2013-08-08Pull in fix for MAINT-2302simon
2013-08-06SH-4411 Thread/mutex rework between main and worker threadMonty Brandenberg
Have the ::notifyLoadedMeshes() method doing correct locking and stall avoidance at the same time. This method now does lazy mutex lock acquisition (trylock()) and if it fails on either, it gives up and comes back later. Capture the maximum number of sequential failures and report this at the end of the run in the log. (So far, with big mesh regions, I've only seen 1s and 2s.) Locking/mutex requirements sorted in other locations as well. LLMutex gets trylock() method as well as new LLMutexTrylock scoped locking class. Clean up some documentation, more to do.
2013-07-18Merge. Refresh from viewer-release.Monty Brandenberg