diff options
| author | Anchor <none@none> | 2019-03-05 21:25:24 -0800 |
|---|---|---|
| committer | Anchor <none@none> | 2019-03-05 21:25:24 -0800 |
| commit | 2cd1a22587b26e7b034e3100ebf46f244d576bff (patch) | |
| tree | 16435bc171f03102980faa810ed3fa5180b06475 /indra/llappearance/llavatarappearance.cpp | |
| parent | 1b449fa055ea6c85b464bc799f196e0ab3b7026e (diff) | |
| parent | 03db2ddc9c27cf842c6185826617b0da0d2b87f5 (diff) | |
Merge
Diffstat (limited to 'indra/llappearance/llavatarappearance.cpp')
| -rw-r--r-- | indra/llappearance/llavatarappearance.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp index c2faa18b37..e60037b739 100644 --- a/indra/llappearance/llavatarappearance.cpp +++ b/indra/llappearance/llavatarappearance.cpp @@ -1348,9 +1348,9 @@ LLVector3 LLAvatarAppearance::getVolumePos(S32 joint_index, LLVector3& volume_of //----------------------------------------------------------------------------- // findCollisionVolume() //----------------------------------------------------------------------------- -LLJoint* LLAvatarAppearance::findCollisionVolume(U32 volume_id) +LLJoint* LLAvatarAppearance::findCollisionVolume(S32 volume_id) { - if ((S32)volume_id > mNumCollisionVolumes) + if ((volume_id < 0) || (volume_id >= mNumCollisionVolumes)) { return NULL; } |