diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-05-11 20:56:42 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-05-11 20:56:42 +0000 |
| commit | 875606a04d656ef6e5600a3a7fb6e8b52feb1945 (patch) | |
| tree | 7189f1cd0a2b043446e6f145cb9c72b3a1f125aa /indra/llcharacter | |
| parent | 783e05058c5d74984ab554fdc60aa06839b9b5c9 (diff) | |
QAR-566 maint-viewer-5-merge-2
Effective merge: release@84102 maint-viewer-5@86348 -> maint-viewer-5-merge-2
Actual merge maint-viewer-5-merge-2 -r 87239 : 87246 -> release
Diffstat (limited to 'indra/llcharacter')
| -rw-r--r-- | indra/llcharacter/llmotion.cpp | 28 | ||||
| -rw-r--r-- | indra/llcharacter/llmotion.h | 4 |
2 files changed, 15 insertions, 17 deletions
diff --git a/indra/llcharacter/llmotion.cpp b/indra/llcharacter/llmotion.cpp index bf332ed838..9123ebfcbd 100644 --- a/indra/llcharacter/llmotion.cpp +++ b/indra/llcharacter/llmotion.cpp @@ -47,22 +47,20 @@ // LLMotion() // Class Constructor //----------------------------------------------------------------------------- -LLMotion::LLMotion( const LLUUID &id ) +LLMotion::LLMotion( const LLUUID &id ) : + mStopped(TRUE), + mActive(FALSE), + mID(id), + mActivationTimestamp(0.f), + mStopTimestamp(0.f), + mSendStopTimestamp(F32_MAX), + mResidualWeight(0.f), + mFadeWeight(1.f), + mDeactivateCallback(NULL), + mDeactivateCallbackUserData(NULL) { - mActivationTimestamp = 0.f; - mStopTimestamp = 0.f; - mSendStopTimestamp = F32_MAX; - mResidualWeight = 0.f; - mFadeWeight = 1.f; - mStopped = TRUE; - mActive = FALSE; - mDeactivateCallback = NULL; - - memset(&mJointSignature[0][0], 0, sizeof(U8) * LL_CHARACTER_MAX_JOINTS); - memset(&mJointSignature[1][0], 0, sizeof(U8) * LL_CHARACTER_MAX_JOINTS); - memset(&mJointSignature[2][0], 0, sizeof(U8) * LL_CHARACTER_MAX_JOINTS); - - mID = id; + for (int i=0; i<3; ++i) + memset(&mJointSignature[i][0], 0, sizeof(U8) * LL_CHARACTER_MAX_JOINTS); } //----------------------------------------------------------------------------- diff --git a/indra/llcharacter/llmotion.h b/indra/llcharacter/llmotion.h index 7669920339..13825dde30 100644 --- a/indra/llcharacter/llmotion.h +++ b/indra/llcharacter/llmotion.h @@ -49,13 +49,13 @@ class LLCharacter; class LLMotion { public: - enum LLMotionBlendType + typedef enum LLMotionBlendType { NORMAL_BLEND, ADDITIVE_BLEND }; - enum LLMotionInitStatus + typedef enum LLMotionInitStatus { STATUS_FAILURE, STATUS_SUCCESS, |