diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-12-13 14:26:36 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-12-13 14:26:36 -0800 |
| commit | 7ce570e2c58d71a73bb28d6c63178a6d69c920d9 (patch) | |
| tree | 95b862d5f537a7509a5542aae8803ea3b935d547 /indra/newview | |
| parent | 37cd8ad2a27188538c29fdcce58cf8ec6185231c (diff) | |
| parent | 0d764afb9c0ba5dd3aeed67370f8d5c7d9b7cf45 (diff) | |
STORM-391 : pull into viewer-development
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llscreenchannel.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/llscreenchannel.h | 3 |
2 files changed, 2 insertions, 11 deletions
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp index 9e0e10d66f..0eeb89792b 100644 --- a/indra/newview/llscreenchannel.cpp +++ b/indra/newview/llscreenchannel.cpp @@ -595,20 +595,15 @@ void LLScreenChannel::showToastsBottom() } } + // Dismiss toasts we don't have space for (STORM-391). if(it != mToastList.rend()) { mHiddenToastsNum = 0; for(; it != mToastList.rend(); it++) { - (*it).toast->stopTimer(); - (*it).toast->setVisible(FALSE); - mHiddenToastsNum++; + (*it).toast->hide(); } } - else - { - closeOverflowToastPanel(); - } } //-------------------------------------------------------------------------- @@ -731,7 +726,6 @@ void LLNotificationsUI::LLScreenChannel::startToastTimer(LLToast* toast) //-------------------------------------------------------------------------- void LLScreenChannel::hideToastsFromScreen() { - closeOverflowToastPanel(); for(std::vector<ToastElem>::iterator it = mToastList.begin(); it != mToastList.end(); it++) (*it).toast->setVisible(FALSE); } diff --git a/indra/newview/llscreenchannel.h b/indra/newview/llscreenchannel.h index 023a65d872..c536a21779 100644 --- a/indra/newview/llscreenchannel.h +++ b/indra/newview/llscreenchannel.h @@ -81,9 +81,6 @@ public: // show all toasts in a channel virtual void redrawToasts() {}; - virtual void closeOverflowToastPanel() {}; - virtual void hideOverflowToastPanel() {}; - // Channel's behavior-functions // set whether a channel will control hovering inside itself or not |