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

Fix crash in LLHandMotion::onUpdate when motion id is out of range.

Nicky 2012-03-29 00:20:54 +02:00
parent eb0568c975
commit d9d47fd1ba
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/llcharacter/llhandmotion.cpp
View File

@ -138,12 +138,18 @@ BOOL LLHandMotion::onUpdate(F32 time, U8* joint_mask)
}
else
{
// <FS:ND> Sometimes we seem to get garbage here, with poses that are out of bounds.
// this is a new morph we didn't know about before
if (*requestedHandPose != mNewPose && mNewPose != mCurrentPose && mNewPose != HAND_POSE_SPREAD)
// if ( *requestedHandPose != mNewPose && mNewPose != mCurrentPose && mNewPose != HAND_POSE_SPREAD)
if (*requestedHandPose >= 0 && *requestedHandPose < NUM_HAND_POSES && *requestedHandPose != mNewPose && mNewPose != mCurrentPose && mNewPose != HAND_POSE_SPREAD)
{
mCharacter->setVisualParamWeight(gHandPoseNames[mNewPose], 0.f);
}
mNewPose = *requestedHandPose;
// mNewPose = *requestedHandPose;
mNewPose = static_cast<eHandPose> ( llclamp( static_cast<int>(*requestedHandPose), 0, NUM_HAND_POSES-1 ) );
// </FS:ND>
}
mCharacter->removeAnimationData("Hand Pose");