diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-05 07:47:56 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-05 07:47:56 +0000 |
| commit | f9788fa6ce0196ffaba6cdcb0fda3ef5cbfe3265 (patch) | |
| tree | 7e9986aa1f645883bfeda4e64e90e3876849cba9 /indra/newview/llsyswellwindow.cpp | |
| parent | 2451b82d8ac45c12f4b3ba821ca102cdfbecf36c (diff) | |
merge -r 1890-1893 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
* Bugs: EXT-1217, EXT-1274, EXT-1272
* Dev: EXT-1101
Diffstat (limited to 'indra/newview/llsyswellwindow.cpp')
| -rw-r--r-- | indra/newview/llsyswellwindow.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp index 669d8d1d70..2bb1e80eb8 100644 --- a/indra/newview/llsyswellwindow.cpp +++ b/indra/newview/llsyswellwindow.cpp @@ -266,10 +266,6 @@ void LLSysWellWindow::toggleWindow() if(!getVisible()) { - if(mChannel) - { - mChannel->removeAndStoreAllStorableToasts(); - } if(isWindowEmpty()) { return; @@ -345,6 +341,13 @@ void LLSysWellWindow::reshapeWindow() curRect.setLeftTopAndSize(curRect.mLeft, newY, MIN_WINDOW_WIDTH, new_window_height); reshape(curRect.getWidth(), curRect.getHeight(), TRUE); setRect(curRect); + + // update notification channel state + // update on a window reshape is important only when a window is visible and docked + if(mChannel && getVisible() && isDocked()) + { + mChannel->updateShowToastsState(); + } } //--------------------------------------------------------------------------------- |