From 8bbbcd9c22010a259d42d23c517e04fe7afd41fd Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Wed, 16 Feb 2011 10:32:12 -0500
Subject: Fix for SH-816

---
 indra/llcharacter/lljoint.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/llcharacter/lljoint.cpp')

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
+
-- 
cgit v1.2.3