summaryrefslogtreecommitdiff
path: root/indra/llcharacter/llmotioncontroller.h
diff options
context:
space:
mode:
authorBrian McGroarty <soft@lindenlab.com>2008-05-07 17:17:42 +0000
committerBrian McGroarty <soft@lindenlab.com>2008-05-07 17:17:42 +0000
commite1e1212daae33723e7da325f295a5c3a6bb78979 (patch)
tree95139904e71995519db2fc6e056940b2f40e73a3 /indra/llcharacter/llmotioncontroller.h
parent41927004751731d2d0cb74989ded36878292ee4e (diff)
QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated
Diffstat (limited to 'indra/llcharacter/llmotioncontroller.h')
-rw-r--r--indra/llcharacter/llmotioncontroller.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcharacter/llmotioncontroller.h b/indra/llcharacter/llmotioncontroller.h
index effea0940a..c6749c5c36 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];
};