From 3a21eb59f1cf0b7672e2beb671e1dbc717e28b3f Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Wed, 15 Aug 2012 20:10:00 +0300
Subject: CHUI-286 (Conversations floater opened by default when a new IM
 session is started (no IM toast shown): now floater silently adds itself to
 the container

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

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

diff --git a/indra/newview/llimconversation.cpp b/indra/newview/llimconversation.cpp
index ec25583c8f..4ca9476458 100644
--- a/indra/newview/llimconversation.cpp
+++ b/indra/newview/llimconversation.cpp
@@ -153,6 +153,7 @@ void LLIMConversation::draw()
 		}
 
 		refresh();
+		updateHeaderAndToolbar();
 
 		// Restart the refresh timer
 		mRefreshTimer->setTimerExpirySec(REFRESH_INTERVAL);
@@ -265,7 +266,7 @@ void LLIMConversation::hideAllStandardButtons()
 
 void LLIMConversation::updateHeaderAndToolbar()
 {
-	bool is_torn_off = isTornOff();
+	bool is_torn_off = !getHost();
 	if (!is_torn_off)
 	{
 		hideAllStandardButtons();
-- 
cgit v1.2.3