livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-10471 - collision volume api

master
Brad Payne (Vir Linden) 2019-02-06 13:44:54 +00:00
parent a77344516c
commit 2d3b805b94
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llappearance/llavatarappearance.cpp
View File

@ -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;
}

2
indra/llappearance/llavatarappearance.h
View File

@ -93,7 +93,7 @@ public:
/*virtual*/ const char* getAnimationPrefix() { return "avatar"; }
/*virtual*/ LLVector3 getVolumePos(S32 joint_index, LLVector3& volume_offset);
/*virtual*/ LLJoint* findCollisionVolume(U32 volume_id);
/*virtual*/ LLJoint* findCollisionVolume(S32 volume_id);
/*virtual*/ S32 getCollisionVolumeID(std::string &name);
/*virtual*/ LLPolyMesh* getHeadMesh();
/*virtual*/ LLPolyMesh* getUpperBodyMesh();

2
indra/llcharacter/llcharacter.h
View File

@ -177,7 +177,7 @@ public:
virtual LLVector3 getVolumePos(S32 joint_index, LLVector3& volume_offset) { return LLVector3::zero; }
virtual LLJoint* findCollisionVolume(U32 volume_id) { return NULL; }
virtual LLJoint* findCollisionVolume(S32 volume_id) { return NULL; }
virtual S32 getCollisionVolumeID(std::string &name) { return -1; }