diff options
author | simon <none@none> | 2013-03-25 11:12:52 -0700 |
---|---|---|
committer | simon <none@none> | 2013-03-25 11:12:52 -0700 |
commit | 98a82c50d539451e1931826ca75fbc01d611806d (patch) | |
tree | 3c3dcac20286246f0724c11f126233702f0bdaaf /indra/newview/lltoast.h | |
parent | 94ae64d6fd30e4dbc3280cd277f772c038ccd9fe (diff) | |
parent | 515f0e5a559ff3f0cb7d02e1d40b0f71425800ea (diff) |
Pull in downstream CHUI code from viewer-development
Diffstat (limited to 'indra/newview/lltoast.h')
-rw-r--r-- | indra/newview/lltoast.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/lltoast.h b/indra/newview/lltoast.h index e1d99b1bcb..ea62f758f8 100644 --- a/indra/newview/lltoast.h +++ b/indra/newview/lltoast.h @@ -169,6 +169,7 @@ public: // get/set Toast's flags or states // get information whether the notification corresponding to the toast is valid or not bool isNotificationValid(); + // get toast's Notification ID const LLUUID getNotificationID() const { return mNotificationID;} // get toast's Session ID @@ -212,7 +213,7 @@ private: //LLRootHandle<LLToast> mHandle; - LLPanel* mWrapperPanel; + LLPanel* mWrapperPanel; // timer counts a lifetime of a toast std::auto_ptr<LLToastLifeTimer> mTimer; @@ -220,8 +221,8 @@ private: F32 mToastLifetime; // in seconds F32 mToastFadingTime; // in seconds - LLPanel* mPanel; - LLButton* mHideBtn; + LLPanel* mPanel; + LLButton* mHideBtn; LLColor4 mBgColor; bool mCanFade; |