diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-10-06 11:31:33 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-10-06 11:31:33 -0400 |
| commit | 617e98f1fe3d5f8965680cdd06ab72756c9c5e78 (patch) | |
| tree | 57e20ab66d49807317cbb079fe517e9fec7e4376 /indra/newview/lldrawpoolavatar.cpp | |
| parent | aafc82668073e26e8c8a951a96bff9b1d1993262 (diff) | |
| parent | 2d52b62e67cf46222396c724d00d2de874819197 (diff) | |
merge changes for 3.8.4-release
Diffstat (limited to 'indra/newview/lldrawpoolavatar.cpp')
| -rwxr-xr-x | indra/newview/lldrawpoolavatar.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index 821d58a9b2..f828b56f7f 100755 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -1600,6 +1600,14 @@ void LLDrawPoolAvatar::updateRiggedFaceVertexBuffer(LLVOAvatar* avatar, LLFace* for (U32 j = 0; j < count; ++j) { LLJoint* joint = avatar->getJoint(skin->mJointNames[j]); + if (!joint) + { + joint = avatar->getJoint("mPelvis"); + } + if (!joint) + { + LL_DEBUGS("Avatar") << "Failed to find " << skin->mJointNames[j] << LL_ENDL; + } if (joint) { mat[j] = skin->mInvBindMatrix[j]; |