diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-12-19 16:42:53 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-12-19 16:42:53 -0500 |
| commit | 8ca5050231b37fc92b5d123b3564cbec6c11778d (patch) | |
| tree | b734449a7e81c449ef643413c5fc0361fd38832a /indra/newview/lltoast.h | |
| parent | 4d7d582535e4b90e0be4d94968ff7a45576d251d (diff) | |
| parent | 16b6a472477bd389771fe4022e425f77ca85c2bd (diff) | |
merge changes for vmrg-206
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; |