diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-14 21:50:02 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-14 21:50:02 +0000 |
| commit | 73caee4208a4e05f66583de099502012fd8415ea (patch) | |
| tree | ff9fa1b7b010e71fb62f26a32c912b5e266f3b23 /indra/newview/lltoast.cpp | |
| parent | 1db494f58ad378b8028c1f071196be82af5fe964 (diff) | |
svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1331 https://svn.aws.productengine.com/secondlife/pe/stable-1@1340 -> viewer-2.0.0-3
EXT-269 EXT-274 EXT-276 EXT-277 EXT-282 EXT-296 EXT-342 EXT-370 EXT-379 EXT-394 EXT-398 EXT-405 EXT-407 EXT-410 EXT-413 EXT-414 EXT-450 EXT-456 EXT-477 EXT-482 EXT-496
Diffstat (limited to 'indra/newview/lltoast.cpp')
| -rw-r--r-- | indra/newview/lltoast.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp index a67ef85f87..07f802cf54 100644 --- a/indra/newview/lltoast.cpp +++ b/indra/newview/lltoast.cpp @@ -49,10 +49,8 @@ LLToast::LLToast(LLToast::Params p) : LLFloater(LLSD()), mCanBeStored(p.can_be_stored), mHideBtnEnabled(p.enable_hide_btn), mIsModal(p.is_modal), - mIsTipNotification(p.is_tip), mHideBtn(NULL), mNotification(p.notification), - mIsViewed(false), mHideBtnPressed(false) { LLUICtrlFactory::getInstance()->buildFloater(this, "panel_toast.xml", NULL); @@ -147,7 +145,6 @@ bool LLToast::timerHasExpired() void LLToast::hide() { setVisible(FALSE); - mIsViewed = false; mTimer.stop(); mOnFade(this); } @@ -230,7 +227,7 @@ void LLToast::onMouseEnter(S32 x, S32 y, MASK mask) setVisibleAndFrontmost(); setBackgroundOpaque(TRUE); - if(mCanFade && !mIsViewed) + if(mCanFade) { mTimer.stop(); } @@ -246,7 +243,7 @@ void LLToast::onMouseLeave(S32 x, S32 y, MASK mask) { mOnToastHover(this, MOUSE_LEAVE); - if(mCanFade && !mIsViewed) + if(mCanFade) { mTimer.start(); } |