summaryrefslogtreecommitdiff
path: root/indra/llcharacter
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-10-21 18:49:19 -0700
committerSteve Bennetts <steve@lindenlab.com>2009-10-21 18:49:19 -0700
commit642d368eccd662494a4958a50ba2bd3301b5207e (patch)
tree0aaa9d2981260051009e765a6171ad328f031183 /indra/llcharacter
parentc7786aa5b614d1c88359bacbe9bd447f5acdd84c (diff)
parente25395e10f5abbed1ed7bc3e4a7fc892070ddc50 (diff)
merge
Diffstat (limited to 'indra/llcharacter')
-rw-r--r--indra/llcharacter/llkeyframestandmotion.cpp2
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)