merge

--HG--
branch : avatar-pipeline

1 files changed, 9 insertions, 5 deletions

diff --git a/indra/newview/llimfloater.h b/indra/newview/llimfloater.h
index 9e1330ff49..f90bc35c34 100644
--- a/indra/newview/llimfloater.h
+++ b/indra/newview/llimfloater.h
@@ -33,11 +33,6 @@
 #ifndef LL_IMFLOATER_H
 #define LL_IMFLOATER_H
 
-// This variable is used to show floaters related to chiclets in a Multi Floater Container
-// So, this functionality does not require to have IM Floaters as Dockable & Transient
-// See EXT-2640.
-#define USE_IM_CONTAINER
-
 #include "lltransientdockablefloater.h"
 #include "lllogchat.h"
 #include "lltooldraganddrop.h"
@@ -68,6 +63,7 @@ public:
 	// LLFloater overrides
 	/*virtual*/ void onClose(bool app_quitting);
 	/*virtual*/ void setDocked(bool docked, bool pop_on_undock = true);
+	/*virtual*/ void setTornOff(bool torn_off);
 
 	// Make IM conversion visible and update the message history
 	static LLIMFloater* show(const LLUUID& session_id);
@@ -105,6 +101,14 @@ public:
 							   void *cargo_data, EAcceptance *accept,
 							   std::string& tooltip_msg);
 
+	/**
+	 * Returns true if chat is displayed in multi tabbed floater
+	 *         false if chat is displayed in multiple windows
+	 */
+	static bool isChatMultiTab();
+
+	static void initIMFloater();
+
 private:
 	// process focus events to set a currently active session
 	/* virtual */ void onFocusLost();