summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.cpp
AgeCommit message (Collapse)Author
2015-01-13merge changes for 3.7.24-releaseOz Linden
2014-12-15merge changes for 3.7.22-releaseOz Linden
2014-12-10Rename llround(..) to ll_round(..) because of a collision with MS llround ↵callum_linden
(long long round) in VS2013
2014-12-01merge fixBrad Payne (Vir Linden)
2014-12-01mergeBrad Payne (Vir Linden)
2014-12-01mergeBrad Payne (Vir Linden)
2014-11-15MAINT-4537 WIP - more joint position management during outfit changesBrad Payne (Vir Linden)
2014-11-14MAINT-4537 WIP - order of operations during outfit changeBrad Payne (Vir Linden)
2014-11-03SL-93 WIP - pelvis fixup offsetsBrad Payne (Vir Linden)
2014-10-30SL-93 - WIP on managing pelvis fixups using new joint offset frameworkBrad Payne (Vir Linden)
2014-10-20Update to build on Xcode 6.0: Large (and final) collection of fixes for ↵callum_linden
unused variables, unused const-variables, unused member variables & functions etc. Also removed flags from CMake
2014-10-20Update to build on Xcode 6.0: clang demands logical comparison bracketscallum_linden
2014-10-29MAINT-4606 WIP - handle removing attachments that contain multiple mesh objectsBrad Payne (Vir Linden)
2014-10-14re-fix STORM-1828 (previous fix lost in merge)Oz Linden
2014-10-14Code style cleanups... mostly fixed indentingOz Linden
2014-10-08Switched to keying joint offsets by mesh idBrad Payne (Vir Linden)
2014-10-07track avatar size info in avatar debug lineBrad Payne (Vir Linden)
2014-08-27WIP on attachment offset management in jointsBrad Payne (Vir Linden)
2014-08-21MAINT-4158 WIP - fix for bug caused by multiple wearables with the same asset idBrad Payne (Vir Linden)
2014-09-05mergeBrad Payne (Vir Linden)
2014-08-27WIP on attachment offset management in jointsBrad Payne (Vir Linden)
2014-08-26MAINT-4322 FIXED Re-assert DND tag animation if it was cancelled by script, ↵Mnikolenko ProductEngine
when DND mode is still active
2014-08-21MAINT-4158 WIP - fix for bug caused by multiple wearables with the same asset idBrad Payne (Vir Linden)
2014-08-15more joint info in ArchetypeXML dump fileBrad Payne (Vir Linden)
2014-08-15more joint info in ArchetypeXML dump fileBrad Payne (Vir Linden)
2014-08-15MAINT-4158 WIP - fix for at least some forms of distortion. I can't repro ↵Brad Payne (Vir Linden)
the drastic height changes, so not positive it addresses that.
2014-08-15MAINT-4158 WIP - fix for at least some forms of distortion. I can't repro ↵Brad Payne (Vir Linden)
the drastic height changes, so not positive it addresses that.
2014-06-18Merge downstream codesimon
2014-05-14v-r -> s-e merge WIPBrad Payne (Vir Linden)
2014-05-13sunshine-external merge WIPBrad Payne (Vir Linden)
2014-05-07Merge downstream version 3.7.8 codesimon
2014-04-22MAINT-3917 FIXED Don't stop updating self avatar even with disabled avatar ↵Mnikolenko ProductEngine
rendering.
2014-03-12mergeBrad Payne (Vir Linden)
2014-03-12merge with releaseRichard Linden
2014-02-12merge with releaseRichard Linden
2014-02-11mergeBrad Payne (Vir Linden)
2014-02-10Merge viewer-releasesimon
2013-12-05mergeBrad Payne (Vir Linden)
2013-12-02merge with releaseRichard Linden
2013-11-21merge changes for 3.6.11-releaseOz Linden
2013-11-12BUILDFIX - miscellaneous stuff missed in the mergeRichard Linden
2013-11-11Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard Linden
2013-11-11Merge 3.6.11 for RC-abilityGraham Linden
2013-11-11merge 3.6.10-releaseOz Linden
2013-11-06fixed some warningsRichard Linden
2013-10-25SH-3419 Replace per-object time dilation factor with region-wideAndrew Meadows
Reviewed with Simon
2013-10-21MergeXiaohong Bao
2013-10-16Fix merge error in llvoavatarGraham Linden
2013-10-16Merge 3.6.8Graham Linden
2013-10-16mergeBrad Payne (Vir Linden)