diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-01 17:52:30 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-01 17:52:30 +0000 |
| commit | 1713a3552b7017cbf781f2effd448f2e8cfb9372 (patch) | |
| tree | 1ffbfd1155ee84a9db937ba9cf1520c0248e6c92 /indra/newview/lltoast.h | |
| parent | cf9814bc05f17e233e5d03e63fc2e519512b3e58 (diff) | |
merge -r 1879-1884 https://svn.aws.productengine.com/secondlife/pe/stable-2
* Major Bugs: EXT-1248 EXT-1127 EXT-844 EXT-1160
* Changes: EXT-1139 (places context menu)
Diffstat (limited to 'indra/newview/lltoast.h')
| -rw-r--r-- | indra/newview/lltoast.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/lltoast.h b/indra/newview/lltoast.h index 2166351fd0..29c231a01d 100644 --- a/indra/newview/lltoast.h +++ b/indra/newview/lltoast.h @@ -35,7 +35,7 @@ #include "llpanel.h" -#include "llfloater.h" +#include "llmodaldialog.h" #include "lltimer.h" #include "llnotifications.h" @@ -51,7 +51,7 @@ namespace LLNotificationsUI * Represents toast pop-up. * This is a parent view for all toast panels. */ -class LLToast : public LLFloater +class LLToast : public LLModalDialog { public: typedef boost::function<void (LLToast* toast)> toast_callback_t; @@ -134,8 +134,6 @@ public: void setCanBeStored(bool can_be_stored) { mCanBeStored = can_be_stored; } // bool getCanBeStored() { return mCanBeStored; } - // - void setModal(bool modal); // Registers signals/callbacks for events @@ -171,7 +169,6 @@ private: LLColor4 mBgColor; bool mCanFade; - bool mIsModal; bool mCanBeStored; bool mHideBtnEnabled; bool mHideBtnPressed; |