summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Expand)Author
2014-03-11Merge downstream code to 3.7.4simon
2014-03-10Pull merge from lindenlab/viewer-releaseMerov Linden
2014-03-10increment viewer version to 3.7.4Oz Linden
2014-03-07Fixes for crash reporter startup race condition, crash reporter CPU use, Seco...Aura Linden
2014-03-05balance the Object cache trees to delete empty nodes to save memory.Xiaohong Bao
2014-03-03[MAINT-3555][MAINT-3703]Baker Linden
2014-02-27Pull merge of codesign workaroundMerov Linden
2014-02-27Merge downstream codesimon
2014-02-27Merge JJ's viewer-release-codesign-workaroundsimon
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-25Merge viewer-releasesimon
2014-02-25[MAINT-3784] - Viewer takes too long to shut downBaker Linden
2014-02-24merge with releaseRichard Linden
2014-02-24Pulled from release.obscurestar
2014-02-24Pull merge from viewer-releaseMerov Linden
2014-02-24increment viewer version to 3.7.3Oz Linden
2014-02-24MAINT-2588 FIXED User cannot delete items from content of other object, using...akl
2014-02-25Merge downstream codesimon
2014-02-21changed variable names and errors to more accurately reflect the operation be...JJ Linden
2014-02-21Merge downstream codesimon
2014-02-20[MAINT-3555] Adding a bajillion log messages to (hopefully) narrow down the c...Baker Linden
2014-02-19duplicated the workaround added for darwin codesigning onto the windos codesi...JJ Linden
2014-02-19Merge with releaseRichard 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
2014-02-12add two debug settings: "SceneLoadLowMemoryBound" and "SceneLoadHighMemoryBound"Xiaohong Bao
2014-02-12Automated merge with http://bitbucket.org/lindenlab/viewer-interestingXiaohong Bao
2014-02-12reduce peak memory usage to fix SH-4574: Interesting: viewer crash in LLJoint...Xiaohong Bao
2014-02-12merge with releaseRichard Linden
2014-02-11Merge. Refresh from viewer-release after 3.7.0 releaseMonty Brandenberg
2014-02-11Hack to fix ACME-1317Cho
2014-02-10increment viewer version to 3.7.1Oz Linden
2014-02-06MergeRichard Linden
2014-02-06added LL_TRACE_ENABLED to allow disabling of lltraceRichard Linden
2014-02-06more fix for a memory crash caused by accessing deleted pointers.Xiaohong Bao
2014-02-05more fix for a non-finite number assertion in llvolumeXiaohong Bao
2014-02-05fix a memory crash caused by accessing deleted pointers.Xiaohong Bao
2014-02-05MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:maksymsproductengine
2014-02-18Pull in viewer-lion to lock down next releasesimon
2014-02-14Merge viewer-release with 3.7.1simon
2014-02-14More memory cleanup of containers after DeletePairedPointer() usage.simon
2014-02-14MAINT-3724 : LLWorld::addRegion logging is misleadingsimon
2014-02-14mergeBaker Linden
2014-02-14[MAINT-3555] Crash in LLPanel::~LLPanel() on shutdownBaker Linden
2014-02-13cleaned up llmanipscale logic for readability...no change in functionalityRichard Linden
2014-02-12MAINT-3465 FIXED Add check mark to selected entry.Mnikolenko ProductEngine
2014-02-11MAINT-3639 disable ALM for OSX 10.6.8Graham Madarasz (Graham Linden)
2014-02-11MAINT-2754 FIXED Call findInstance() instead of getInstance().Mnikolenko ProductEngine