diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-04 09:59:57 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-04 09:59:57 -0500 |
commit | a3e30250e8dc16d976e1df5d50bfdca28aec6d7e (patch) | |
tree | 6269e0d5a461c4cde9cc07f2d1f54a1eb3f4e036 /indra/newview/lltoast.h | |
parent | 1620ad6d00a77b2089e0ae5f6de30f9a954c6167 (diff) | |
parent | 570d562f5871f40bd7f8c683db5316ffd0133335 (diff) |
merge
Diffstat (limited to 'indra/newview/lltoast.h')
-rw-r--r-- | indra/newview/lltoast.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/lltoast.h b/indra/newview/lltoast.h index 77229e7beb..0b06728935 100644 --- a/indra/newview/lltoast.h +++ b/indra/newview/lltoast.h @@ -27,7 +27,7 @@ #ifndef LL_LLTOAST_H #define LL_LLTOAST_H - +#include "llinstancetracker.h" #include "llpanel.h" #include "llmodaldialog.h" #include "lleventtimer.h" @@ -69,7 +69,7 @@ private : * Represents toast pop-up. * This is a parent view for all toast panels. */ -class LLToast : public LLModalDialog +class LLToast : public LLModalDialog, public LLInstanceTracker<LLToast> { friend class LLToastLifeTimer; public: @@ -102,6 +102,8 @@ public: Params(); }; + + static void updateClass(); LLToast(const LLToast::Params& p); virtual ~LLToast(); @@ -221,7 +223,7 @@ private: F32 mToastLifetime; // in seconds F32 mToastFadingTime; // in seconds - + LLPanel* mPanel; LLButton* mHideBtn; |