diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-05-17 16:06:27 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-05-17 16:06:27 -0400 |
commit | 82111ecbde4bacd4cbd5ae5d076876d0ddedd04d (patch) | |
tree | 197c9172917d24dd98cc611ae3f3753df2b2400d /indra/llappearance/llavatarappearance.cpp | |
parent | d0dea44c010ec4e747b139ce55013e3203ba980a (diff) |
SL-315 - resetSkeleton() fixes, mostly to get better behavior with non-self avs
Diffstat (limited to 'indra/llappearance/llavatarappearance.cpp')
-rwxr-xr-x | indra/llappearance/llavatarappearance.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp index 4f01665449..2ce43436db 100755 --- a/indra/llappearance/llavatarappearance.cpp +++ b/indra/llappearance/llavatarappearance.cpp @@ -601,7 +601,7 @@ BOOL LLAvatarAppearance::setupBone(const LLAvatarBoneInfo* info, LLJoint* parent } // add to parent - if (parent) + if (parent && (joint->getParent()!=parent)) { parent->addChild( joint ); } |