diff options
| author | Don Kjer <don@lindenlab.com> | 2008-05-19 17:02:33 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2008-05-19 17:02:33 +0000 |
| commit | 38558960978a0741dd9c79c4c7a108b8a1f99eff (patch) | |
| tree | b7221183a7c91c1097a78cf5875197431852b0b8 /indra/llcharacter/llmotioncontroller.h | |
| parent | e77de5d685ae441f72920f0e04d9887ee958745a (diff) | |
EFFECTIVE MERGES:
svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release
svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release
ACTUAL MERGE: svn merge -r 87631:87698 svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release
dataserver-is-deprecated
Diffstat (limited to 'indra/llcharacter/llmotioncontroller.h')
| -rw-r--r-- | indra/llcharacter/llmotioncontroller.h | 2 |
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]; }; |