From 9d8b189886ae14800d58f9729d8c8ea9b338ed52 Mon Sep 17 00:00:00 2001 From: Dmitry Zaporozhan Date: Wed, 2 Dec 2009 14:18:40 +0200 Subject: Implemented normal sub-task EXT-2975 - Make the IM multifloater optional. --HG-- branch : product-engine --- indra/newview/llimfloater.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'indra/newview/llimfloater.h') diff --git a/indra/newview/llimfloater.h b/indra/newview/llimfloater.h index 9e1330ff49..2c762c4d9a 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" @@ -105,6 +100,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(); -- cgit v1.2.3 From 69a2843d5bfc3c5cb2706639eb3429369ded969b Mon Sep 17 00:00:00 2001 From: Sergey Borushevsky Date: Wed, 2 Dec 2009 19:49:44 +0200 Subject: Implemented normal task EXT-2833 ("Close" button should hide bottom bar windows) When IM floater isn't torn off, "Close" button is disabled. It's not hidden, since there is a hack in LLFloater::updateButton. --HG-- branch : product-engine --- indra/newview/llimfloater.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llimfloater.h') diff --git a/indra/newview/llimfloater.h b/indra/newview/llimfloater.h index 2c762c4d9a..f90bc35c34 100644 --- a/indra/newview/llimfloater.h +++ b/indra/newview/llimfloater.h @@ -63,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); -- cgit v1.2.3