diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-12-21 15:21:12 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-12-21 15:21:12 -0500 |
| commit | 570d562f5871f40bd7f8c683db5316ffd0133335 (patch) | |
| tree | ff29baa075e3de2030bfad8755be6ef261691416 /indra/newview/llsyswellwindow.cpp | |
| parent | b022ebf13c9a227f87a112419e237894a1231c8c (diff) | |
| parent | 55f1d95d978dd6ac38c9f77882399323567fb634 (diff) | |
merge changes for vmrg-209 and vmrg-210 back from beta branch
Diffstat (limited to 'indra/newview/llsyswellwindow.cpp')
| -rw-r--r-- | indra/newview/llsyswellwindow.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp index 3aa6a3b7e5..0cb6c85012 100644 --- a/indra/newview/llsyswellwindow.cpp +++ b/indra/newview/llsyswellwindow.cpp @@ -159,6 +159,7 @@ void LLSysWellWindow::setVisible(BOOL visible) LLTransientDockableFloater::setVisible(visible); // update notification channel state + initChannel(); // make sure the channel still exists if(mChannel) { mChannel->updateShowToastsState(); @@ -598,6 +599,13 @@ LLIMWellWindow* LLIMWellWindow::getInstance(const LLSD& key /*= LLSD()*/) return LLFloaterReg::getTypedInstance<LLIMWellWindow>("im_well_window", key); } + +// static +LLIMWellWindow* LLIMWellWindow::findInstance(const LLSD& key /*= LLSD()*/) +{ + return LLFloaterReg::findTypedInstance<LLIMWellWindow>("im_well_window", key); +} + BOOL LLIMWellWindow::postBuild() { BOOL rv = LLSysWellWindow::postBuild(); @@ -751,7 +759,10 @@ void LLIMWellWindow::removeObjectRow(const LLUUID& notification_id) { if (mMessageList->removeItemByValue(notification_id)) { - mSysWellChiclet->updateWidget(isWindowEmpty()); + if (mSysWellChiclet) + { + mSysWellChiclet->updateWidget(isWindowEmpty()); + } } else { |