3 files changed, 20 insertions, 1 deletions
diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp
index 5c49214051..2449b01e15 100644
--- a/indra/llcharacter/lljoint.cpp
+++ b/indra/llcharacter/lljoint.cpp
@@ -239,6 +239,21 @@ void LLJoint::setPosition( const LLVector3& pos )
 	}
 }
 
+//--------------------------------------------------------------------
+// storeCurrentXform()
+//--------------------------------------------------------------------
+void LLJoint::storeCurrentXform( const LLVector3& pos )
+{
+	mOldXform = mXform;
+	setPosition( pos );
+}
+//--------------------------------------------------------------------
+// restoreOldXform()
+//--------------------------------------------------------------------
+void LLJoint::restoreOldXform( void )
+{
+	mXform = mOldXform;
+}
 
 //--------------------------------------------------------------------
 // getWorldPosition()
diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h
index 0473d1599a..cf644e899f 100644
--- a/indra/llcharacter/lljoint.h
+++ b/indra/llcharacter/lljoint.h
@@ -86,6 +86,7 @@ protected:
 
 	// explicit transformation members
 	LLXformMatrix		mXform;
+	LLXformMatrix		mOldXform;
 
 public:
 	U32				mDirtyFlags;
@@ -178,6 +179,9 @@ public:
 
 	S32 getJointNum() const { return mJointNum; }
 	void setJointNum(S32 joint_num) { mJointNum = joint_num; }
+	
+	void restoreOldXform( void );
+	void storeCurrentXform( const LLVector3& pos );
 };
 #endif // LL_LLJOINT_H
 
diff --git a/indra/llcharacter/tests/lljoint_test.cpp b/indra/llcharacter/tests/lljoint_test.cpp
index 06e455883b..c666ccb1e8 100644
--- a/indra/llcharacter/tests/lljoint_test.cpp
+++ b/indra/llcharacter/tests/lljoint_test.cpp
@@ -48,7 +48,7 @@ namespace tut
 	};
 	typedef test_group<lljoint_data> lljoint_test;
 	typedef lljoint_test::object lljoint_object;
-	tut::lljoint_test lljoint_testcase("lljoint");
+	tut::lljoint_test lljoint_testcase("LLJoint");
 
 	template<> template<>
 	void lljoint_object::test<1>()