diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-29 16:20:20 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-29 16:20:20 -0700 |
| commit | 9b8b0571645f8b607ecc24221c807cc02a03692f (patch) | |
| tree | f52f58138ecf70abf21f2a1b62097c3cbfce1c2f /indra/llcharacter | |
| parent | 6d887be5895286f6b65ea751014f33bd9e0faac4 (diff) | |
| parent | 5798ac6fc8488f02d3a2f338f5b5eeedb35e7ba6 (diff) | |
Merge
Diffstat (limited to 'indra/llcharacter')
| -rw-r--r-- | indra/llcharacter/llkeyframestandmotion.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcharacter/llkeyframestandmotion.cpp b/indra/llcharacter/llkeyframestandmotion.cpp index 1d42298f4d..1ae0ddeea0 100644 --- a/indra/llcharacter/llkeyframestandmotion.cpp +++ b/indra/llcharacter/llkeyframestandmotion.cpp @@ -190,7 +190,7 @@ BOOL LLKeyframeStandMotion::onUpdate(F32 time, U8* joint_mask) if (dot(mPelvisState->getJoint()->getWorldRotation(), mLastGoodPelvisRotation) < ROTATION_THRESHOLD) { mLastGoodPelvisRotation = mPelvisState->getJoint()->getWorldRotation(); - mLastGoodPelvisRotation.normQuat(); + mLastGoodPelvisRotation.normalize(); mTrackAnkles = TRUE; } else if ((mCharacter->getCharacterPosition() - mLastGoodPosition).magVecSquared() > POSITION_THRESHOLD) |