summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2014-03-10Pull merge from lindenlab/viewer-releaseMerov Linden
2014-03-10increment viewer version to 3.7.4Oz 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-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-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-19duplicated the workaround added for darwin codesigning onto the windos ↵JJ Linden
codesigning
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-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-05MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:maksymsproductengine
- memory leaks fixing;
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
- Added clear() after DeletePointer() call to hopfully fix this...
2014-02-11MAINT-3639 disable ALM for OSX 10.6.8Graham Madarasz (Graham Linden)
2014-02-10Merge viewer-releasesimon
2014-02-10MAINT-3710 FIXED List of members is removed from General tab. Title column ↵Mnikolenko ProductEngine
is added to the list in Members tab. Roles tab is renamed to Roles & Members and Roles sub-tab is default now.
2014-01-30fix odd editor artifactOz Linden
2014-01-30Another build triggerMonty Brandenberg
2014-01-29FITMESH-6: correct bounds checkingOz Linden
2014-01-29another trigger editMonty Brandenberg
2014-01-27Trivial edit to stimulate a new build.Monty Brandenberg
2014-01-27MAINT-3657 FIXED Don't change state when other user declines call.Mnikolenko ProductEngine
2014-01-24merge fix to the codesign fixOz Linden
2014-01-24fix error message python boo-booOz Linden
2014-01-24merge workaround for build farm Mac code signing failuresOz Linden
2014-01-23FITMESH-6, FITMESH-20 Fix for some objects disappearing when hardware ↵Dave Parks
skinning enabled and ALM disabled.
2014-01-22add retries around OSX codesign to try to work around frequent build farm ↵Oz Linden
failures
2014-01-17MAINT-3536 FIXED new crash in XML_ParserFree: temporary solutionmaksymsproductengine
2014-01-15MAINT-3397 : fix to use slurl for localization handler for ↵simon
EstateManagerFailedllTeleportHome message
2014-01-10Merge after backoutsimon
2014-01-10Revert earlier back-out for MAINT-535 ... it's back insimon
2014-01-09Merge. Refresh from viewer-release after 3.6.13 release.Monty Brandenberg
2014-01-09SH-4667 HTTP Viewer reports network error instead of a misnamed joint on ↵Monty Brandenberg
mesh upload Tried to add consistent mesh upload retries in the HTTP work but a combination of bad status choices in the upload service and the one-shot nature of the upload capabilities means that status information can be lost. For now, retain the wonderful manual retry logic. At some future point, we might fix the services or add application-level retry.
2014-01-09Merge 3.6.14 from releasesimon
2014-01-08merge changes for 3.6.13-releaseOz Linden