diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-28 09:59:39 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-28 09:59:39 +0100 |
| commit | dc6662d7a80e4dcf3a6474eda5eb318febf6cad5 (patch) | |
| tree | 7cad61535554bd8fb333ea4b1e2ef34be8712f30 /indra/newview/llvoavatar.h | |
| parent | 617e9614455fb8c70fb6c219ceeab0b53adf25b5 (diff) | |
| parent | a7ffd8b7a3d26be6f1841f538631adbb0f3f5604 (diff) | |
merge from viewer-public
Diffstat (limited to 'indra/newview/llvoavatar.h')
| -rw-r--r-- | indra/newview/llvoavatar.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 1d8de6f4b5..924a05622c 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -158,12 +158,14 @@ public: virtual LLJoint* getCharacterJoint(U32 num); virtual BOOL allocateCharacterJoints(U32 num); + virtual LLUUID remapMotionID(const LLUUID& id); virtual BOOL startMotion(const LLUUID& id, F32 time_offset = 0.f); virtual BOOL stopMotion(const LLUUID& id, BOOL stop_immediate = FALSE); virtual void stopMotionFromSource(const LLUUID& source_id); virtual void requestStopMotion(LLMotion* motion); LLMotion* findMotion(const LLUUID& id) const; void startDefaultMotions(); + void dumpAnimationState(); virtual LLJoint* getJoint(const std::string &name); virtual LLJoint* getRootJoint() { return &mRoot; } |