diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-08-11 15:53:00 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-08-11 15:53:00 -0400 |
| commit | d0eed685023fca913e643d3e90e97e5dc6914a99 (patch) | |
| tree | ef4180e5b23c2f08ff6b7065a8494247cdc503ea /indra | |
| parent | 003156a89d9edf9bdecdefccdb27d40f73bc979d (diff) | |
SL-134 WIP - Possible fix for octree corruption/crash when mesh has unknown joints.
Diffstat (limited to 'indra')
| -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 0432f6f27c..267061b83d 100755 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -4172,6 +4172,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]; |