summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolavatar.cpp
diff options
context:
space:
mode:
authorpavelkproductengine <none@none>2015-10-09 18:14:37 +0300
committerpavelkproductengine <none@none>2015-10-09 18:14:37 +0300
commitaf9971e43a37c47b7175bce0d350c73a282ff818 (patch)
treea70f1e78c27187daeaab364faece5d0d3f28d6ba /indra/newview/lldrawpoolavatar.cpp
parent17ff449ae6b2759f212daa4fd3de0a7ea2664866 (diff)
parent358b29060fc3caf8de212985b17686b4460cc6d9 (diff)
Merge Xcode 7 Update
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];