diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-07-19 22:24:33 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-07-19 22:24:33 +0000 |
| commit | 1b15b8cda7853e55a91fd0140311ed69f3cca677 (patch) | |
| tree | 33edfb0495161594a50dcfbed3a3f42e7fde9143 /indra/newview/llskinningutil.cpp | |
| parent | dc14dbf54d332a6cdc43002bb71ed71e9a473647 (diff) | |
| parent | 4c849ba91363f82da05cce1221b04075a6ca72af (diff) | |
Merged in DV528-merge-6.4.22 (pull request #630)
DRTVWR-528 merge up to v 6.4.22
Diffstat (limited to 'indra/newview/llskinningutil.cpp')
| -rw-r--r-- | indra/newview/llskinningutil.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llskinningutil.cpp b/indra/newview/llskinningutil.cpp index f325315933..e02b21f036 100644 --- a/indra/newview/llskinningutil.cpp +++ b/indra/newview/llskinningutil.cpp @@ -131,7 +131,12 @@ void LLSkinningUtil::initSkinningMatrixPalette( initJointNums(const_cast<LLMeshSkinInfo*>(skin), avatar); for (U32 j = 0; j < count; ++j) { - LLJoint *joint = avatar->getJoint(skin->mJointNums[j]); + S32 joint_num = skin->mJointNums[j]; + LLJoint *joint = NULL; + if (joint_num >= 0 && joint_num < LL_CHARACTER_MAX_ANIMATED_JOINTS) + { + joint = avatar->getJoint(joint_num); + } llassert(joint); if (joint) { |