Merge

1 files changed, 5 insertions, 0 deletions

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 7468281f65..71706f0146 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -762,6 +762,7 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
 	mPelvisOffset = LLVector3(0.0f,0.0f,0.0f);

 	mLastPelvisToFoot = 0.0f;

 	mPelvisFixup = 0.0f;

+	mLastPelvisFixup = 0.0f;

 }

 

 //------------------------------------------------------------------------

@@ -3805,6 +3806,7 @@ void LLVOAvatar::setPelvisOffset( bool hasOffset, const LLVector3& offsetAmount,
 		//Store off last pelvis to foot value

 		mLastPelvisToFoot = mPelvisToFoot;

 		mPelvisOffset	  = offsetAmount;

+		mLastPelvisFixup  = mPelvisFixup;

 		mPelvisFixup	  = pelvisFixup;

 	}

 }

@@ -3825,6 +3827,7 @@ void LLVOAvatar::postPelvisSetRecalc( void )
 void LLVOAvatar::setPelvisOffset( F32 pelvisFixupAmount )

 {	

 	mHasPelvisOffset  = true;

+	mLastPelvisFixup  = mPelvisFixup;	

 	mPelvisFixup	  = pelvisFixupAmount;	

 }

 //------------------------------------------------------------------------

@@ -4965,6 +4968,7 @@ void LLVOAvatar::resetJointPositions( void )
 		mSkeleton[i].setId( LLUUID::null );

 	}

 	mHasPelvisOffset = false;

+	mPelvisFixup	 = mLastPelvisFixup;

 }

 //-----------------------------------------------------------------------------

 // resetSpecificJointPosition

@@ -5024,6 +5028,7 @@ void LLVOAvatar::resetJointPositionsToDefault( void )
 	}

 	//make sure we don't apply the joint offset

 	mHasPelvisOffset = false;

+	mPelvisFixup	 = mLastPelvisFixup;

 	postPelvisSetRecalc();

 }

 //-----------------------------------------------------------------------------