diff options
author | prep <none@none> | 2012-03-13 15:48:24 -0400 |
---|---|---|
committer | prep <none@none> | 2012-03-13 15:48:24 -0400 |
commit | fab57eea612f34ed9d8c8559674ead1760aab42b (patch) | |
tree | 51394d44e1b89bb75d168464aec539f60f44f8cd /indra/newview/llpreviewanim.h | |
parent | 87b414c4934d0d52eef0b323245568bb1e95ec70 (diff) | |
parent | 00717147d2b832fa3239267edf409f0a1dfcd9fd (diff) |
pull and merge from viewer-development
Diffstat (limited to 'indra/newview/llpreviewanim.h')
-rw-r--r-- | indra/newview/llpreviewanim.h | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/indra/newview/llpreviewanim.h b/indra/newview/llpreviewanim.h index 32e07ee33a..8eaed6ca1f 100644 --- a/indra/newview/llpreviewanim.h +++ b/indra/newview/llpreviewanim.h @@ -33,24 +33,18 @@ class LLPreviewAnim : public LLPreview { public: - enum e_activation_type { NONE = 0, PLAY = 1, AUDITION = 2 }; - LLPreviewAnim(const LLSD& key); - static void playAnim( void* userdata ); - static void auditionAnim( void* userdata ); - static void endAnimCallback( void *userdata ); + LLPreviewAnim(const LLSD& key); /*virtual*/ BOOL postBuild(); /*virtual*/ void onClose(bool app_quitting); - void activate(e_activation_type type); + void draw(); + void cleanup(); + void play(const LLSD& param); protected: - LLAnimPauseRequest mPauseRequest; - LLUUID mItemID; - std::string mTitle; - LLUUID mObjectID; - LLButton* mPlayBtn; - LLButton* mAuditionBtn; + LLUUID mItemID; + bool mDidStart; }; -#endif // LL_LLPREVIEWSOUND_H +#endif // LL_LLPREVIEWANIM_H |