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.cpp | |
| 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.cpp')
| -rw-r--r-- | indra/newview/lltoast.cpp | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp index ecaf4fb150..84931e4d2d 100644 --- a/indra/newview/lltoast.cpp +++ b/indra/newview/lltoast.cpp @@ -41,7 +41,7 @@ using namespace LLNotificationsUI; //-------------------------------------------------------------------------- -LLToast::LLToast(LLToast::Params p) : LLFloater(LLSD()), +LLToast::LLToast(LLToast::Params p) : LLModalDialog(LLSD(), p.is_modal), mPanel(p.panel), mTimerValue(p.timer_period), mNotificationID(p.notif_id), @@ -49,7 +49,6 @@ LLToast::LLToast(LLToast::Params p) : LLFloater(LLSD()), mCanFade(p.can_fade), mCanBeStored(p.can_be_stored), mHideBtnEnabled(p.enable_hide_btn), - mIsModal(p.is_modal), mHideBtn(NULL), mNotification(p.notification), mHideBtnPressed(false) @@ -67,13 +66,6 @@ LLToast::LLToast(LLToast::Params p) : LLFloater(LLSD()), mHideBtn->setClickedCallback(boost::bind(&LLToast::hide,this)); } - if(mIsModal) - { - gFocusMgr.setMouseCapture( this ); - gFocusMgr.setTopCtrl( this ); - setFocus(TRUE); - } - // init callbacks if present if(!p.on_delete_toast.empty()) mOnDeleteToastSignal.connect(p.on_delete_toast); @@ -104,11 +96,6 @@ void LLToast::setHideButtonEnabled(bool enabled) LLToast::~LLToast() { mOnToastDestroyedSignal(this); - if(mIsModal) - { - gFocusMgr.unlockFocus(); - gFocusMgr.releaseFocusIfNeeded( this ); - } } //-------------------------------------------------------------------------- @@ -205,18 +192,6 @@ void LLToast::draw() } //-------------------------------------------------------------------------- -void LLToast::setModal(bool modal) -{ - mIsModal = modal; - if(mIsModal) - { - gFocusMgr.setMouseCapture( this ); - gFocusMgr.setTopCtrl( this ); - setFocus(TRUE); - } -} - -//-------------------------------------------------------------------------- void LLToast::setVisible(BOOL show) { if(show) |