From af7de5dd9373a5a15c4d5ea107782e50eb3ce62c Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Thu, 12 Jul 2012 19:06:29 +0300
Subject: CHUI-170 Workaround for the permanently showing of the nearbychat's
 name in a conversations list when that floater is torn-off

---
 indra/newview/llnearbychat.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index 384762549a..1c81cdc4bc 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -363,6 +363,9 @@ void LLNearbyChat::addToHost()
 		LLIMFloaterContainer* im_box = LLIMFloaterContainer::getInstance();
 		if (im_box)
 		{
+			// Make sure the Nearby Chat is present in the conversations list
+			im_box->addConversationListItem(getTitle(), getKey(), this);
+
 			if (gSavedSettings.getBOOL("NearbyChatIsNotTornOff"))
 			{
 				im_box->addFloater(this, TRUE, LLTabContainer::END);
-- 
cgit v1.2.3