From 0739436b027fc181349719adfb608febafe65fbd Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 21 Mar 2014 23:40:13 +0100
Subject: [PATCH] Conversations floater: Make sure the contacts and nearby chat
 floater get added in the correct order and at the correct location

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

diff --git a/indra/newview/fsfloaterimcontainer.cpp b/indra/newview/fsfloaterimcontainer.cpp
index a11c2d0b00..9f3acc2c16 100644
--- a/indra/newview/fsfloaterimcontainer.cpp
+++ b/indra/newview/fsfloaterimcontainer.cpp
@@ -117,7 +117,7 @@ void FSFloaterIMContainer::onOpen(const LLSD& key)
 		}
 		else
 		{
-			LLMultiFloater::showFloater(floater_contacts);
+			addFloater(floater_contacts, TRUE);
 		}
 	}
 
@@ -135,7 +135,7 @@ void FSFloaterIMContainer::onOpen(const LLSD& key)
 		}
 		else
 		{
-			LLMultiFloater::showFloater(floater_chat);
+			addFloater(floater_chat, TRUE);
 		}
 	}
 
@@ -175,7 +175,7 @@ void FSFloaterIMContainer::addFloater(LLFloater* floaterp,
 		else
 		{
 			// add chat history as second tab if contact window is present, first tab otherwise
-			if (getChildView("imcontacts"))
+			if (dynamic_cast<FSFloaterContacts*>(mTabContainer->getPanelByIndex(0)))
 			{
 				// assuming contacts window is first tab, select it
 				mTabContainer->selectFirstTab();