diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
| commit | a4000c3744e42fcbb638e742f3b63fa31a0dee15 (patch) | |
| tree | 7f472c30e65bbfa04ee9bc06631a1af305cc31fb /indra/newview/llpreviewanim.h | |
| parent | 6c4cadbb04d633ad7b762058bdeba6e1f650dafd (diff) | |
merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7
Diffstat (limited to 'indra/newview/llpreviewanim.h')
| -rw-r--r-- | indra/newview/llpreviewanim.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/newview/llpreviewanim.h b/indra/newview/llpreviewanim.h index fe794d4283..ca42b7e731 100644 --- a/indra/newview/llpreviewanim.h +++ b/indra/newview/llpreviewanim.h @@ -39,18 +39,17 @@ class LLPreviewAnim : public LLPreview { public: - LLPreviewAnim(const std::string& name, const LLRect& rect, const std::string& title, - const LLUUID& item_uuid, - const S32& activate, - const LLUUID& object_uuid = LLUUID::null); + 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 ); - + /*virtual*/ BOOL postBuild(); + void activate(e_activation_type type); + protected: virtual void onClose(bool app_quitting); - virtual const char *getTitleName() const { return "Animation"; } LLAnimPauseRequest mPauseRequest; LLUUID mItemID; |