diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-12-07 20:27:13 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-12-07 20:27:13 +0000 |
| commit | b01d567a5d9e2b5dd28bcc7b3f474fabd93e7a2f (patch) | |
| tree | c45377783f53f033d43a4d06d36bbeb2a7f7e79b /indra/llcharacter/llkeyframewalkmotion.h | |
| parent | a64f283477ea4db09c8b515ab94709e1fb5c82af (diff) | |
EFFECTIVE MERGE: merge release@73232 maint-viewer-2@75100 -> maint-viewer-2-merge
EFFECTIVE MERGE: merge -r 74370 library-update -> maint-viewer-2-merge
ACTUAL MERGE: release@75267 maint-viewer-2-merge@75293 -> release
Diffstat (limited to 'indra/llcharacter/llkeyframewalkmotion.h')
| -rw-r--r-- | indra/llcharacter/llkeyframewalkmotion.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcharacter/llkeyframewalkmotion.h b/indra/llcharacter/llkeyframewalkmotion.h index f52a8d6e33..bd30b5d11d 100644 --- a/indra/llcharacter/llkeyframewalkmotion.h +++ b/indra/llcharacter/llkeyframewalkmotion.h @@ -123,7 +123,7 @@ public: LLCharacter *mCharacter; LLJoint* mLeftAnkleJoint; LLJoint* mRightAnkleJoint; - LLJointState mPelvisState; + LLPointer<LLJointState> mPelvisState; LLJoint* mPelvisJoint; LLVector3d mLastLeftAnklePos; LLVector3d mLastRightAnklePos; @@ -141,7 +141,7 @@ class LLFlyAdjustMotion : public LLMotion { public: // Constructor - LLFlyAdjustMotion(const LLUUID &id) : LLMotion(id) {mName = "fly_adjust";} + LLFlyAdjustMotion(const LLUUID &id); public: //------------------------------------------------------------------------- @@ -173,7 +173,7 @@ protected: // Member Data //------------------------------------------------------------------------- LLCharacter *mCharacter; - LLJointState mPelvisState; + LLPointer<LLJointState> mPelvisState; F32 mRoll; }; |