From d273ba2ce2707c6a2fe45c08fdc2524aae19ad00 Mon Sep 17 00:00:00 2001
From: Brian McGroarty <soft@lindenlab.com>
Date: Wed, 7 May 2008 20:48:38 +0000
Subject: Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946
 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated

---
 indra/llcharacter/llkeyframemotion.cpp     | 17 -----------------
 indra/llcharacter/llkeyframemotion.h       |  6 +-----
 indra/llcharacter/llkeyframewalkmotion.cpp | 14 +++-----------
 indra/llcharacter/llmotioncontroller.cpp   | 25 ++++++++++++-------------
 indra/llcharacter/llmotioncontroller.h     |  2 +-
 indra/llcharacter/llpose.cpp               |  2 --
 6 files changed, 17 insertions(+), 49 deletions(-)

(limited to 'indra/llcharacter')

diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp
index ce59349d55..91d96904ba 100644
--- a/indra/llcharacter/llkeyframemotion.cpp
+++ b/indra/llcharacter/llkeyframemotion.cpp
@@ -71,15 +71,6 @@ static F32 MAX_CONSTRAINTS = 10;
 // JointMotionList
 //-----------------------------------------------------------------------------
 LLKeyframeMotion::JointMotionList::JointMotionList()
-	: mDuration(0.f),
-	  mLoop(FALSE),
-	  mLoopInPoint(0.f),
-	  mLoopOutPoint(0.f),
-	  mEaseInDuration(0.f),
-	  mEaseOutDuration(0.f),
-	  mBasePriority(LLJoint::LOW_PRIORITY),
-	  mHandPose(LLHandMotion::HAND_POSE_SPREAD),
-	  mMaxPriority(LLJoint::LOW_PRIORITY)
 {
 }
 
@@ -2125,19 +2116,11 @@ void LLKeyframeDataCache::clear()
 //-----------------------------------------------------------------------------
 LLKeyframeMotion::JointConstraint::JointConstraint(JointConstraintSharedData* shared_data) : mSharedData(shared_data) 
 {
-	mWeight = 0.f;
 	mTotalLength = 0.f;
 	mActive = FALSE;
 	mSourceVolume = NULL;
 	mTargetVolume = NULL;
 	mFixupDistanceRMS = 0.f;
-
-	int i;
-	for (i=0; i<MAX_CHAIN_LENGTH; ++i)
-	{
-		mJointLengths[i] = 0.f;
-		mJointLengthFractions[i] = 0.f;
-	}
 }
 
 //-----------------------------------------------------------------------------
diff --git a/indra/llcharacter/llkeyframemotion.h b/indra/llcharacter/llkeyframemotion.h
index a50447c3bf..c383e5e99e 100644
--- a/indra/llcharacter/llkeyframemotion.h
+++ b/indra/llcharacter/llkeyframemotion.h
@@ -224,11 +224,7 @@ protected:
 			mEaseOutStopTime(0.f), 
 			mUseTargetOffset(FALSE),
 			mConstraintType(TYPE_POINT),
-			mConstraintTargetType(TYPE_BODY),
-			mSourceConstraintVolume(0),
-			mTargetConstraintVolume(0),
-			mJointStateIndices(NULL)
-		{ };
+			mConstraintTargetType(TYPE_BODY) {};
 		~JointConstraintSharedData() { delete [] mJointStateIndices; }
 
 		S32						mSourceConstraintVolume;
diff --git a/indra/llcharacter/llkeyframewalkmotion.cpp b/indra/llcharacter/llkeyframewalkmotion.cpp
index 471acd8ac3..0d7e34bb4f 100644
--- a/indra/llcharacter/llkeyframewalkmotion.cpp
+++ b/indra/llcharacter/llkeyframewalkmotion.cpp
@@ -139,16 +139,9 @@ BOOL LLKeyframeWalkMotion::onUpdate(F32 time, U8* joint_mask)
 // LLWalkAdjustMotion()
 // Class Constructor
 //-----------------------------------------------------------------------------
-LLWalkAdjustMotion::LLWalkAdjustMotion(const LLUUID &id) :
-	LLMotion(id),
-	mLastTime(0.f),
-	mAvgCorrection(0.f),
-	mSpeedAdjust(0.f),
-	mAnimSpeed(0.f),
-	mAvgSpeed(0.f),
-	mRelativeDir(0.f),
-	mAnkleOffset(0.f)
+LLWalkAdjustMotion::LLWalkAdjustMotion(const LLUUID &id) : LLMotion(id)
 {
+	mLastTime = 0.f;
 	mName = "walk_adjust";
 
 	mPelvisState = new LLJointState;
@@ -356,8 +349,7 @@ void LLWalkAdjustMotion::onDeactivate()
 // LLFlyAdjustMotion::LLFlyAdjustMotion()
 //-----------------------------------------------------------------------------
 LLFlyAdjustMotion::LLFlyAdjustMotion(const LLUUID &id)
-	: LLMotion(id),
-	  mRoll(0.f)
+	: LLMotion(id)
 {
 	mName = "fly_adjust";
 
diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp
index 5bcae5e635..fff19dbefe 100644
--- a/indra/llcharacter/llmotioncontroller.cpp
+++ b/indra/llcharacter/llmotioncontroller.cpp
@@ -155,19 +155,18 @@ LLMotion *LLMotionRegistry::createMotion( const LLUUID &id )
 // LLMotionController()
 // Class Constructor
 //-----------------------------------------------------------------------------
-LLMotionController::LLMotionController()
-	: mTimeFactor(1.f),
-	  mCharacter(NULL),
-	  mTime(0.f),
-	  mTimeOffset(0.f),
-	  mLastTime(0.0f),
-	  mHasRunOnce(FALSE),
-	  mPaused(FALSE),
-	  mPauseTime(0.f),
-	  mTimeStep(0.f),
-	  mTimeStepCount(0),
-	  mLastInterp(0.f)
-{
+LLMotionController::LLMotionController(  )
+{
+	mTime = 0.f;
+	mTimeOffset = 0.f;
+	mLastTime = 0.0f;
+	mHasRunOnce = FALSE;
+	mPaused = FALSE;
+	mPauseTime = 0.f;
+	mTimeStep = 0.f;
+	mTimeStepCount = 0;
+	mLastInterp = 0.f;
+	mTimeFactor = 1.f;
 }
 
 
diff --git a/indra/llcharacter/llmotioncontroller.h b/indra/llcharacter/llmotioncontroller.h
index c6749c5c36..effea0940a 100644
--- a/indra/llcharacter/llmotioncontroller.h
+++ b/indra/llcharacter/llmotioncontroller.h
@@ -227,10 +227,10 @@ protected:
 	F32					mLastTime;
 	BOOL				mHasRunOnce;
 	BOOL				mPaused;
-	F32					mPauseTime;
 	F32					mTimeStep;
 	S32					mTimeStepCount;
 	F32					mLastInterp;
+	F32					mPauseTime;
 
 	U8					mJointSignature[2][LL_CHARACTER_MAX_JOINTS];
 };
diff --git a/indra/llcharacter/llpose.cpp b/indra/llcharacter/llpose.cpp
index c57fbfdc5d..2120cb223e 100644
--- a/indra/llcharacter/llpose.cpp
+++ b/indra/llcharacter/llpose.cpp
@@ -188,7 +188,6 @@ LLJointStateBlender::LLJointStateBlender()
 	{
 		mJointStates[i] = NULL;
 		mPriorities[i] = S32_MIN;
-		mAdditiveBlends[i] = FALSE;
 	}
 }
 
@@ -459,7 +458,6 @@ void LLJointStateBlender::resetCachedJoint()
 //-----------------------------------------------------------------------------
 
 LLPoseBlender::LLPoseBlender()
-	: mNextPoseSlot(0)
 {
 }
 
-- 
cgit v1.2.3