diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-05-28 17:19:20 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-05-28 17:19:20 +0100 |
| commit | 24a867a646a979d48cf5f4c94eae041507a09310 (patch) | |
| tree | 5f963caa5c9fd69e3ef0669220cc736cf472d8a4 /indra/llcharacter/llmotioncontroller.h | |
| parent | 176b5c5a67c3bd34da787c7446d7349dc1937803 (diff) | |
| parent | 7983de22074beb25a832f89aa3e7a9728baca328 (diff) | |
Merged from ssh://hg.lindenlab.com/dessie/viewer-private
Diffstat (limited to 'indra/llcharacter/llmotioncontroller.h')
| -rw-r--r-- | indra/llcharacter/llmotioncontroller.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llcharacter/llmotioncontroller.h b/indra/llcharacter/llmotioncontroller.h index 5c3ec223cb..f8bf5ac289 100644 --- a/indra/llcharacter/llmotioncontroller.h +++ b/indra/llcharacter/llmotioncontroller.h @@ -92,6 +92,7 @@ class LLMotionController public: typedef std::list<LLMotion*> motion_list_t; typedef std::set<LLMotion*> motion_set_t; + BOOL mIsSelf; public: // Constructor @@ -169,6 +170,10 @@ public: bool isMotionLoading( LLMotion *motion ); LLMotion *findMotion( const LLUUID& id ) const; + void dumpMotions(); + + const LLFrameTimer& getFrameTimer() { return mTimer; } + protected: // internal operations act on motion instances directly // as there can be duplicate motions per id during blending overlap |