From 9353a9e6ef071bd980c319d038b1dedb649d2db0 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Mon, 25 Jun 2012 23:55:25 +0300
Subject: CHUI-167 FIXED Move onClose() from LLIMFloater to it's basic class
 (LLIMConversation) for correct using add/remove conversation list items also
 for LLNearbyChat

---
 indra/newview/llimconversation.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'indra/newview/llimconversation.cpp')

diff --git a/indra/newview/llimconversation.cpp b/indra/newview/llimconversation.cpp
index cbebf3edd3..f304997abf 100644
--- a/indra/newview/llimconversation.cpp
+++ b/indra/newview/llimconversation.cpp
@@ -339,6 +339,20 @@ void LLIMConversation::onOpen(const LLSD& key)
 	updateHeaderAndToolbar();
 }
 
+// virtual
+void LLIMConversation::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);
+        }
+    }
+}
+
 void LLIMConversation::onTearOffClicked()
 {
 	onClickTearOff(this);
-- 
cgit v1.2.3