diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-02-28 16:37:47 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-02-28 16:37:47 -0800 |
| commit | e1a76999c3e8aad337d765fcd6eb50c8191409ea (patch) | |
| tree | bc671ff3f6da473df49f2b834e94ee6150157256 /indra/llcharacter/llcharacter.h | |
| parent | d7ad30a2d4dfd83f93b0150464214f2df776eb9c (diff) | |
| parent | 03db2ddc9c27cf842c6185826617b0da0d2b87f5 (diff) | |
Merge
Diffstat (limited to 'indra/llcharacter/llcharacter.h')
| -rw-r--r-- | indra/llcharacter/llcharacter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcharacter/llcharacter.h b/indra/llcharacter/llcharacter.h index 1a3e307663..2fac5f53a6 100644 --- a/indra/llcharacter/llcharacter.h +++ b/indra/llcharacter/llcharacter.h @@ -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; } |