diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-09-10 03:12:12 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-09-10 03:12:12 +0000 |
| commit | ccb1d2b1e43369803cf9ab1ffc7deefbac2db8fc (patch) | |
| tree | 57b085da51db0f63ab249926102f8ebbca8da1ee /indra/newview/llscreenchannel.cpp | |
| parent | 44f294d484185ef3cb9f51e5cba6a3ee269b96dc (diff) | |
merge -r 1609-1612 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
Fixes: EXT-825 EXT-893 EXT-889 EXT-88
Diffstat (limited to 'indra/newview/llscreenchannel.cpp')
| -rw-r--r-- | indra/newview/llscreenchannel.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp index 1fbe359295..2157f1af74 100644 --- a/indra/newview/llscreenchannel.cpp +++ b/indra/newview/llscreenchannel.cpp @@ -64,6 +64,7 @@ LLScreenChannel::LLScreenChannel(LLUUID& id): mOverflowToastPanel(NULL), mStartU setMouseOpaque( false ); } +//-------------------------------------------------------------------------- void LLScreenChannel::init(S32 channel_left, S32 channel_right) { S32 channel_top = getRootView()->getRect().getHeight() - gSavedSettings.getS32("NavBarMargin"); @@ -326,6 +327,7 @@ void LLScreenChannel::showToastsBottom() mHiddenToastsNum = 0; for(; it != mToastList.rend(); it++) { + (*it).toast->stopTimer(); mHiddenToastsNum++; } createOverflowToast(bottom, gSavedSettings.getS32("NotificationToastTime")); |