From c0842339e72b15331a5bbb6bd41324c28916d678 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 19 Jun 2012 15:05:20 -0700 Subject: CHUI-138 : Suppress chiclets for conversations when using tabbed UI; Make sure list is cleaned up on close --- indra/newview/llimfloater.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'indra/newview/llimfloater.cpp') diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 882637151d..4b954de738 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -109,6 +109,16 @@ void LLIMFloater::onFocusReceived() // virtual void LLIMFloater::onClose(bool app_quitting) { + // Always suppress the IM from the conversations list on close if present for any reason + if (LLIMConversation::isChatMultiTab()) + { + LLIMFloaterContainer* im_box = LLIMFloaterContainer::findInstance(); + if (im_box) + { + im_box->removeConversationListItem(mSessionID); + } + } + LLIMModel::LLIMSession* session = LLIMModel::instance().findIMSession( mSessionID); @@ -140,16 +150,6 @@ void LLIMFloater::onClose(bool app_quitting) // Last change: // EXT-3516 X Button should end IM session, _ button should hide gIMMgr->leaveSession(mSessionID); - - // Suppress the IM from the conversations list - if (LLIMConversation::isChatMultiTab()) - { - LLIMFloaterContainer* im_box = LLIMFloaterContainer::findInstance(); - if (im_box) - { - im_box->removeConversationListItem(mSessionID); - } - } } /* static */ -- cgit v1.3