diff options
author | Tofu Buzzard <no-email> | 2011-02-16 11:45:20 -0800 |
---|---|---|
committer | Tofu Buzzard <no-email> | 2011-02-16 11:45:20 -0800 |
commit | 8921bdf0577c1282d5aa9cd920f0b57b77d95682 (patch) | |
tree | f4c2a6b55703a40ec104ace5792cf80b5bef3fac /indra/llcharacter/lljoint.cpp | |
parent | 681d64de0261235cbafe6b9b082344241b6fbf54 (diff) | |
parent | 8bbbcd9c22010a259d42d23c517e04fe7afd41fd (diff) |
merge
Diffstat (limited to 'indra/llcharacter/lljoint.cpp')
-rw-r--r-- | indra/llcharacter/lljoint.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp index d68abcef5a..19907933cb 100644 --- a/indra/llcharacter/lljoint.cpp +++ b/indra/llcharacter/lljoint.cpp @@ -50,6 +50,7 @@ LLJoint::LLJoint() mUpdateXform = TRUE; mJointNum = -1; touch(); + mResetAfterRestoreOldXform = false; } @@ -250,6 +251,7 @@ void LLJoint::setDefaultFromCurrentXform( void ) void LLJoint::storeCurrentXform( const LLVector3& pos ) { mOldXform = mXform; + mResetAfterRestoreOldXform = true; setPosition( pos ); } //-------------------------------------------------------------------- @@ -257,6 +259,7 @@ void LLJoint::storeCurrentXform( const LLVector3& pos ) //-------------------------------------------------------------------- void LLJoint::restoreOldXform( void ) { + mResetAfterRestoreOldXform = false; mXform = mOldXform; } //-------------------------------------------------------------------- @@ -556,3 +559,4 @@ void LLJoint::clampRotation(LLQuaternion old_rot, LLQuaternion new_rot) } // End + |