diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-04-23 07:36:42 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-04-23 07:36:42 -0400 |
| commit | e769e76cd3975ea0a936df1130f0b60b592438a4 (patch) | |
| tree | 2c2051dade80e8aa7118d2b5b7f16da79d320ad2 | |
| parent | 6eb0bb676ba398117e2f86544326ddca03296225 (diff) | |
SL-375 - ignore joint position overrides if they are equivalent to the default position.
| -rwxr-xr-x | indra/newview/llvoavatar.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 5f030435dc..e6df4f4fd1 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -5375,7 +5375,12 @@ void LLVOAvatar::addAttachmentPosOverridesForObject(LLViewerObject *vo) { pJoint->setId( currentId ); const LLVector3& jointPos = pSkinData->mAlternateBindMatrix[i].getTranslation(); - //if (!jointPos.isNull()) + if ((jointPos-pJoint->getDefaultPosition()).isNull()) + { + LL_DEBUGS("Avatar") << "Attachment pos override ignored for " << pJoint->getName() + << ", pos " << jointPos << " is same as default pos" << LL_ENDL; + } + else { //Set the joint position pJoint->addAttachmentPosOverride( jointPos, mesh_id, avString() ); |