diff options
| author | Richard Linden <none@none> | 2012-05-18 13:20:57 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-05-18 13:20:57 -0700 |
| commit | 7251f780ff5ecf1c804e1d198bbeb015290c919a (patch) | |
| tree | 9233b76afd84f861a81133d0821f0e57006e6417 /indra/newview/lltoast.h | |
| parent | a572f31ffb79ddfd61bcbb4b6fcb79bfa796d191 (diff) | |
| parent | 296e55c1b323c05b6544b69ace04afe19102396b (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui
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; |