aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorJacek Antonelli2010-02-18 19:16:41 -0600
committerJacek Antonelli2010-02-18 19:16:54 -0600
commite56caa9c48b1b209f349cda88886d20f91407adf (patch)
tree6251578c1bb26546c44362617114899541f968d5 /linden/indra
parentPorted some asset storage changes from Snowglobe. (diff)
downloadmeta-impy-e56caa9c48b1b209f349cda88886d20f91407adf.zip
meta-impy-e56caa9c48b1b209f349cda88886d20f91407adf.tar.gz
meta-impy-e56caa9c48b1b209f349cda88886d20f91407adf.tar.bz2
meta-impy-e56caa9c48b1b209f349cda88886d20f91407adf.tar.xz
SNOW-488: Malformed animation crash.
Patch by Robin Cornelius.
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/newview/llvoavatar.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index d2f4a58..883d32f 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -5306,7 +5306,7 @@ LLVector3 LLVOAvatar::getVolumePos(S32 joint_index, LLVector3& volume_offset)
5306//----------------------------------------------------------------------------- 5306//-----------------------------------------------------------------------------
5307LLJoint* LLVOAvatar::findCollisionVolume(U32 volume_id) 5307LLJoint* LLVOAvatar::findCollisionVolume(U32 volume_id)
5308{ 5308{
5309 if ((S32)volume_id > mNumCollisionVolumes) 5309 if ((S32)volume_id > mNumCollisionVolumes || (S32)volume_id < 0)
5310 { 5310 {
5311 return NULL; 5311 return NULL;
5312 } 5312 }