merge.

4 files changed, 12 insertions, 4 deletions

diff --git a/indra/llcharacter/llbvhloader.h b/indra/llcharacter/llbvhloader.h
index 85ab035e61..38617bd6d4 100644
--- a/indra/llcharacter/llbvhloader.h
+++ b/indra/llcharacter/llbvhloader.h
@@ -166,6 +166,7 @@ public:
 	Translation()
 	{
 		mIgnore = FALSE;
+		mIgnorePositions = FALSE;
 		mRelativePositionKey = FALSE;
 		mRelativeRotationKey = FALSE;
 		mPriorityModifier = 0;
diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp
index 37afcb7cda..5c49214051 100644
--- a/indra/llcharacter/lljoint.cpp
+++ b/indra/llcharacter/lljoint.cpp
@@ -70,6 +70,7 @@ LLJoint::LLJoint(const std::string &name, LLJoint *parent)
 	mXform.setScaleChildOffset(TRUE);
 	mXform.setScale(LLVector3(1.0f, 1.0f, 1.0f));
 	mDirtyFlags = MATRIX_DIRTY | ROTATION_DIRTY | POSITION_DIRTY;
+	mUpdateXform = FALSE;
 	mJointNum = 0;
 
 	setName(name);
diff --git a/indra/llcharacter/llkeyframewalkmotion.cpp b/indra/llcharacter/llkeyframewalkmotion.cpp
index b5817e5bde..461309bee9 100644
--- a/indra/llcharacter/llkeyframewalkmotion.cpp
+++ b/indra/llcharacter/llkeyframewalkmotion.cpp
@@ -58,11 +58,15 @@ const F32 MAX_ROLL = 0.6f;
 // LLKeyframeWalkMotion()
 // Class Constructor
 //-----------------------------------------------------------------------------
-LLKeyframeWalkMotion::LLKeyframeWalkMotion(const LLUUID &id) : LLKeyframeMotion(id)
+LLKeyframeWalkMotion::LLKeyframeWalkMotion(const LLUUID &id)
+  : LLKeyframeMotion(id),
+    
+    mCharacter(NULL),
+    mCyclePhase(0.0f),
+    mRealTimeLast(0.0f),
+    mAdjTimeLast(0.0f),
+    mDownFoot(0)
 {
-	mRealTimeLast = 0.0f;
-	mAdjTimeLast = 0.0f;
-	mCharacter = NULL;
 }
 
 
diff --git a/indra/llcharacter/llstatemachine.cpp b/indra/llcharacter/llstatemachine.cpp
index 73c6951211..e6fa4d7985 100644
--- a/indra/llcharacter/llstatemachine.cpp
+++ b/indra/llcharacter/llstatemachine.cpp
@@ -54,6 +54,7 @@ bool	operator!=(const LLUniqueID &a, const LLUniqueID &b)
 //-----------------------------------------------------------------------------
 LLStateDiagram::LLStateDiagram()
 {
+	mDefaultState = NULL;
 	mUseDefaultState = FALSE;
 }
 
@@ -305,6 +306,7 @@ LLStateMachine::LLStateMachine()
 	// we haven't received a starting state yet
 	mCurrentState = NULL;
 	mLastState = NULL;
+	mLastTransition = NULL;
 	mStateDiagram = NULL;
 }