summaryrefslogtreecommitdiff
path: root/indra/llappearance/llavatarappearance.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2019-02-06 13:44:54 +0000
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2019-02-06 13:44:54 +0000
commit2d3b805b949a294d3f298eb3d786aac777ebb51e (patch)
tree16e5ddb7e6911c5d7b020faced1d3f033fabdf33 /indra/llappearance/llavatarappearance.cpp
parenta77344516ce00ed7b447626c1d57195dd183b7f9 (diff)
SL-10471 - collision volume api
Diffstat (limited to 'indra/llappearance/llavatarappearance.cpp')
-rw-r--r--indra/llappearance/llavatarappearance.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp
index c28b5f8081..38cda2e2f1 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) || ((S32)volume_id < 0))
+ if ((volume_id < 0) || (volume_id >= mNumCollisionVolumes))
{
return NULL;
}