diff options
Diffstat (limited to 'indra/newview/llsyswellwindow.cpp')
| -rw-r--r-- | indra/newview/llsyswellwindow.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp index a26b1c14af..2bbb5a2767 100644 --- a/indra/newview/llsyswellwindow.cpp +++ b/indra/newview/llsyswellwindow.cpp @@ -131,7 +131,8 @@ void LLSysWellWindow::removeItemByID(const LLUUID& id) void LLSysWellWindow::onItemClick(LLSysWellItem* item) { LLUUID id = item->getID(); - mChannel->loadStoredToastByIDToChannel(id); + if(mChannel) + mChannel->loadStoredToastByIDToChannel(id); } //--------------------------------------------------------------------------------- @@ -139,7 +140,8 @@ void LLSysWellWindow::onItemClose(LLSysWellItem* item) { LLUUID id = item->getID(); removeItemByID(id); - mChannel->killToastByNotificationID(id); + if(mChannel) + mChannel->killToastByNotificationID(id); } //--------------------------------------------------------------------------------- @@ -154,10 +156,15 @@ void LLSysWellWindow::setVisible(BOOL visible) // on Show adjust position of SysWell chiclet's window if(visible) { - mChannel->removeAndStoreAllVisibleToasts(); + if(mChannel) + mChannel->removeAndStoreAllVisibleToasts(); + adjustWindowPosition(); // *TODO: won't be necessary after docking is realized } + if(mChannel) + mChannel->setShowToasts(!visible); + LLFloater::setVisible(visible); } |