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/llmotioncontroller.cpp | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

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

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