diff options
| author | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-09-30 01:25:49 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-09-30 01:25:49 +0300 |
| commit | 358b29060fc3caf8de212985b17686b4460cc6d9 (patch) | |
| tree | 8921d2d219d4d4443aaafc9cfe98daa9760d780f /indra/newview/lldrawpoolavatar.cpp | |
| parent | c84fe50f18d39adf1bb712927a71628d343781d0 (diff) | |
| parent | 2d52b62e67cf46222396c724d00d2de874819197 (diff) | |
Merge downstream code, version 3.8.5
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]; |