diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-14 14:31:25 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-14 14:31:25 -0700 |
| commit | 562006aa5585a42418cae978516505035cd34d8d (patch) | |
| tree | f42488d1b07907937f5b9e236617d9f02297d32d /indra/newview/llscreenchannel.cpp | |
| parent | 9a8042d5a3edfd07727793a1939c3ab361ceec9a (diff) | |
| parent | 7cd1020f2953b776e1878e7b4e365d4b23e6b07b (diff) | |
Merge with SVN viewer-2.0.0-3 branch
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")); |