summaryrefslogtreecommitdiff
path: root/indra/newview/llimfloater.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-06-18 18:12:38 -0700
committerMerov Linden <merov@lindenlab.com>2012-06-18 18:12:38 -0700
commit06f142e974854854c91988b6a8bc5c6005a40731 (patch)
treeb8afc27910b24457a6597c7f48b6a13028011f92 /indra/newview/llimfloater.cpp
parent48bc7166fbb4c52769ecc583c4f198d757050408 (diff)
CHUI-145 : Select on list focus on relevant panel, torn off or not; torn off im stay in list; closed im suppressed from lits in all situations
Diffstat (limited to 'indra/newview/llimfloater.cpp')
-rw-r--r--indra/newview/llimfloater.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index 30a9c29ec6..14fcd602fc 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -139,6 +139,16 @@ 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 */