summaryrefslogtreecommitdiff
path: root/indra/llappearance/llavatarappearance.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2016-05-17 16:06:27 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2016-05-17 16:06:27 -0400
commit82111ecbde4bacd4cbd5ae5d076876d0ddedd04d (patch)
tree197c9172917d24dd98cc611ae3f3753df2b2400d /indra/llappearance/llavatarappearance.cpp
parentd0dea44c010ec4e747b139ce55013e3203ba980a (diff)
SL-315 - resetSkeleton() fixes, mostly to get better behavior with non-self avs
Diffstat (limited to 'indra/llappearance/llavatarappearance.cpp')
-rwxr-xr-xindra/llappearance/llavatarappearance.cpp2
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 );
}