diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-06-02 11:09:17 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-06-02 11:09:17 -0700 |
| commit | 28d23e8c85ba6073cffbd3597342c43f4f9c7971 (patch) | |
| tree | 8e817fa78c67ffe686d57f4889016623dfeffab2 /indra/llcharacter/llmotioncontroller.h | |
| parent | b742f0c2a4cf1355044fbcebdad4346a4871a89b (diff) | |
| parent | 4835c615d5a00f146bcd5c7a50153418ce2a3613 (diff) | |
Merge
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 |