From 11ef9f3d41a2e628e1ded8dcb0a306fe328ae0ce Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 23 Nov 2009 16:29:10 +0200
Subject: Work on normal task EXT-2640 (Create a tabbed IM multifloater) -
 disabled Transient & Dockable functionality of IM Floaters to do not have
 collisions with multifloater - remove debug attributes in xml

--HG--
branch : product-engine
---
 indra/newview/llimfloatercontainer.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

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

diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp
index 94017526c8..6e4b3ae214 100644
--- a/indra/newview/llimfloatercontainer.cpp
+++ b/indra/newview/llimfloatercontainer.cpp
@@ -35,9 +35,6 @@
 
 #include "llimfloatercontainer.h"
 
-// TODO: mantipov: replace with floater_im_session
-#include "llimpanel.h"
-
 //
 // LLIMFloaterContainer
 //
@@ -54,22 +51,24 @@ LLIMFloaterContainer::~LLIMFloaterContainer()
 
 BOOL LLIMFloaterContainer::postBuild()
 {
-	// TODO: mantipov: verify if it is needed
-	mTabContainer->lockTabs();
+	// Do not call base postBuild to not connect to mCloseSignal to not close all floaters via Close button
+	// mTabContainer will be initialized in LLMultiFloater::addChild()
 	return TRUE;
 }
 
 void LLIMFloaterContainer::onOpen(const LLSD& key)
 {
-	// TODO: mantipov: verify if it is needed
+	LLMultiFloater::onOpen(key);
+/*
 	if (key.isDefined())
 	{
-		LLFloaterIMPanel* impanel = gIMMgr->findFloaterBySession(key.asUUID());
-		if (impanel)
+		LLIMFloater* im_floater = LLIMFloater::findInstance(key.asUUID());
+		if (im_floater)
 		{
-			impanel->openFloater();
+			im_floater->openFloater();
 		}
 	}
+*/
 }
 
 void LLIMFloaterContainer::addFloater(LLFloater* floaterp, 
-- 
cgit v1.2.3