summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2014-03-13Merged in viewer-releaseAura Linden
2014-03-12merge with releaseRichard Linden
2014-03-11Fixed up some compile errors after mergeBaker Linden
2014-03-113.7.4. mergeBaker Linden
2014-03-11- Added null checks in a couple places.Baker 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-10increment viewer version to 3.7.4Oz 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-05balance the Object cache trees to delete empty nodes to save memory.Xiaohong Bao
2014-03-05[MAINT-3385] Filter function of Banned Agents doesn't workBaker Linden
- Removed filter
2014-03-03viewer-release mergeBaker 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 JJ's viewer-release-codesign-workaroundsimon
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-25[MAINT-3784] - Viewer takes too long to shut downBaker Linden
- Removed a lot of logging code to reduce application close time
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-21changed variable names and errors to more accurately reflect the operation ↵JJ Linden
being performed
2014-02-20[MAINT-3555] Adding a bajillion log messages to (hopefully) narrow down the ↵Baker Linden
cause of the crash
2014-02-20Fix build problemmaksymsproductengine
2014-02-19[MAINT-3751] - Can't uncheck Ban ability from roleBaker Linden
- Fixed an issue where, once granted the ban ability, it could not become unchecked.
2014-02-19duplicated the workaround added for darwin codesigning onto the windos ↵JJ Linden
codesigning
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-13[MAINT-3721] - Viewer crash upon click inviteBaker Linden
- Fixed a crash that would happen when a resident attempts to invite someone into a group
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 ↵Xiaohong Bao
LLJoint::setScale
2014-02-12merge with releaseRichard Linden
2014-02-11viewer-release mergeBaker 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-06viewer-release mergeBaker Linden
2014-02-06[GroupBan] When adding "Manage Ban List" ability additionally grant ↵Baker Linden
requisite abilities - Viewer side implementation for MAINT-3467 complete
2014-02-06accidentally left _CrtCheckMemory defined in non-Windows buildsRichard Linden
2014-02-06MergeRichard Linden
2014-02-06added LL_TRACE_ENABLED to allow disabling of lltraceRichard Linden