summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2015-10-07A small tweak when SLVoice is not runningBjoseph Wombat
2015-10-06merged changes from viewer-xcode-7Bjoseph Wombat
2015-10-06A small state machine change to wait until the media update event has ↵Bjoseph Wombat
arrived when leaving a region channel and before joining a p2p channel
2015-10-01merge changes for 3.8.4-releaseOz Linden
2015-09-29increment viewer version to 3.8.5Oz Linden
2015-09-18Supress error after Xcode 7 update: error: null passed to a callee that ↵callum_linden
requires a non-null argument
2015-09-18comment out LL_DEBUGS that fails because 'expression evalauted desipite ↵callum_linden
being used as an operand to typeid'
2015-09-18Turn off (for now) the warnings/errors that result from Boost.Units usagecallum_linden
2015-09-18Update version of Xcode (7.0) and SDKs (10.11)callum_linden
2015-09-15MAINT-5601 Physics model not previewed, physics model not applied to mesh on ↵AndreyL ProductEngine
upload Some improvements: renaming to act like "legacy matching" would apply only to the models simple enough for this
2015-09-11MAINT-5601 FIXED Physics model not previewed, physics model not applied to ↵AndreyL ProductEngine
mesh on upload
2015-09-07MAINT-5602 FIXED Viewer crashes when loading physics from fileAndreyL ProductEngine
--HG-- branch : develop
2015-08-26MAINT-5532 related crash fix and some log improvementsandreykproductengine
2015-08-21MAINT-5536 FIXED Mac viewer crash when started from a web browser handlerandreykproductengine
2015-08-20MAINT-5532 FIXED upload of duck.dae from MAINT-4483 crashes mac viewerandreykproductengine
2015-08-18Merge viewer-release and become version 3.8.4andreykproductengine
2015-08-17merge changes for 3.8.3-releaseOz Linden
2015-08-17mergeBrad Payne (Vir Linden)
2015-08-17increment viewer version to 3.8.4Oz Linden
2015-08-11SL-134 WIP - Possible fix for octree corruption/crash when mesh has unknown ↵Brad Payne (Vir Linden)
joints.
2015-08-11SL-133 WIP - possible fix for unknown joints warping to originBrad Payne (Vir Linden)
2015-08-07Merge fix - clearing duplicatesandreykproductengine
2015-08-04merge conflict fix (isDead() check got missed)andreykproductengine
2015-08-04merge conflict fixandreykproductengine
2015-08-04Merge downstream code and become version 3.8.3andreykproductengine
2015-08-04Merge viewer-release and become version 3.8.3AndreyL ProductEngine
2015-08-03increment viewer version to 3.8.3Oz Linden
2015-07-30MAINT-5430 Crash LLAssetStorage::downloadCompleteCallbackandreykproductengine
2015-07-28MAINT-5432 MAINT-5440 FIXED CrashAndreyL ProductEngine
in LLUUID::operator==(LLUUID const &) and LLFolderView::removeSelectedItems()
2015-07-24MAINT-5432 FIXED Null check to avoid crashMnikolenko ProductEngine
2015-07-16merge changes for 3.8.1-releaseOz Linden
2015-07-15more fixes from code review by AnsarielOz Linden
2015-07-15fixes from code review by AnsarielOz Linden
2015-07-15Merge downstream code and become version 3.8.2andreykproductengine
2015-07-14merge translation fixes from EliOz Linden
2015-07-14translation file corrections from EliOz Linden
2015-07-143.8.1-releaseOz Linden
2015-07-14increment viewer version to 3.8.2Oz Linden
2015-07-14merge 3.8.0-release and correct xml errors caused by reformattingOz Linden
2015-07-07merge latest fix from VivoxOz Linden
2015-07-07merge changes for 3.8.0-releaseOz Linden
2015-07-02test fix for a race condition in the state machine when switching between regionBjoseph Wombat
voice and P2P calls.
2015-07-02Merge downstream code and become version 3.8.1andreykproductengine
2015-06-30mergeBrad Payne (Vir Linden)
2015-06-30increment viewer version to 3.8.1Oz Linden
2015-06-24MAINT-5278 WIP - avoid updateAppearanceFromCOF when adding only attachments.Brad Payne (Vir Linden)
2015-06-16merge changes for STORM-2109Oz Linden
2015-06-16Merge downstream code and become version 3.7.31andreykproductengine
2015-06-15mergeBrad Payne (Vir Linden)
2015-06-15DRTVWR-382: merge in 3.7.30 hotfixGlenn Glazer