diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-09-29 15:24:03 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-09-29 15:24:03 -0400 |
| commit | 9757c3a7fa1c67ecbf62df4493dc68040ba0e264 (patch) | |
| tree | 1d3ec613c44b1c91b2ee91546be7be0de9c72f6e /indra/newview/llvovolume.cpp | |
| parent | 453dee2d21477ad534fa9982b844c40adde9b93e (diff) | |
| parent | 2d52b62e67cf46222396c724d00d2de874819197 (diff) | |
merge changes for 3.8.4-release
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rwxr-xr-x | indra/newview/llvovolume.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 2f7dd88e20..84be1faff2 100755 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -4179,6 +4179,10 @@ void LLRiggedVolume::update(const LLMeshSkinInfo* skin, LLVOAvatar* avatar, cons for (U32 j = 0; j < maxJoints; ++j) { LLJoint* joint = avatar->getJoint(skin->mJointNames[j]); + if (!joint) + { + joint = avatar->getJoint("mPelvis"); + } if (joint) { mat[j] = skin->mInvBindMatrix[j]; |