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

2 files changed, 11 insertions, 0 deletions

diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index 9b7df38c5e..9de0b1f827 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -419,6 +419,16 @@ void LLIMFloater::setDocked(bool docked, bool pop_on_undock)
 	}
 }
 
+void LLIMFloater::setTornOff(bool torn_off)
+{
+	// When IM Floater isn't torn off, "close" button should be hidden.
+	// This call will just disables it, since there is a hack in LLFloater::updateButton,
+	// which prevents hiding of close button in that case.
+	setCanClose(torn_off);
+
+	LLTransientDockableFloater::setTornOff(torn_off);
+}
+
 void LLIMFloater::setVisible(BOOL visible)
 {
 	LLNotificationsUI::LLScreenChannel* channel = dynamic_cast<LLNotificationsUI::LLScreenChannel*>
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);