summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolavatar.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <andreylproductengine@lindenlab.com>2015-10-16 02:29:45 +0300
committerAndreyL ProductEngine <andreylproductengine@lindenlab.com>2015-10-16 02:29:45 +0300
commita30a2045f56909586aff5cb74a1e85dd010ad1ae (patch)
tree9595f6d812a79319e32eca2e83aee9e2defc1ae5 /indra/newview/lldrawpoolavatar.cpp
parent9a24b487e2e0407d4bde6091eae020acb543b741 (diff)
parentc1e3f778cb377999edf49764088f3f23a2302afc (diff)
Merge
--HG-- branch : develop
Diffstat (limited to 'indra/newview/lldrawpoolavatar.cpp')
-rwxr-xr-xindra/newview/lldrawpoolavatar.cpp8
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];