diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-05-28 10:41:17 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-05-28 10:41:17 -0400 |
| commit | 955698c7a6d04c1ed895bfc2b9b5acf4e8d5473e (patch) | |
| tree | 9600f378eae7f0a8e5bd5b8d309db2d187b2eaaa /indra/newview/llvoavatar.h | |
| parent | 9cbd65d67966db823b91aa4f133625f978907b74 (diff) | |
| parent | 7e0b36d6102f5e285296cd8e0dc6961b5c73c7cb (diff) | |
automated merge
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 70a27cb2aa..3c940e03c0 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; } |