merge release-QAR-499 Viewer 1.20 RC 2 (additional changes)

merge Branch_1-20-Viewer -r 85100 : 85278 -> release

1 files changed, 16 insertions, 1 deletions

diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp
index 5ff75c4969..22e418d60d 100644
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -162,7 +162,7 @@ void LLFloaterChat::onClose(bool app_quitting)
 void LLFloaterChat::onVisibilityChange(BOOL new_visibility)
 {
 	// Hide the chat overlay when our history is visible.
-	gConsole->setVisible( !new_visibility );
+	updateConsoleVisibility();
 
 	// stop chat history tab from flashing when it appears
 	if (new_visibility)
@@ -173,6 +173,21 @@ void LLFloaterChat::onVisibilityChange(BOOL new_visibility)
 	LLFloater::onVisibilityChange(new_visibility);
 }
 
+void LLFloaterChat::setMinimized(BOOL minimized)
+{
+	LLFloater::setMinimized(minimized);
+	updateConsoleVisibility();
+}
+
+
+void LLFloaterChat::updateConsoleVisibility()
+{
+	// determine whether we should show console due to not being visible
+	gConsole->setVisible( !isInVisibleChain()								// are we not in part of UI being drawn?
+							|| isMinimized()								// are we minimized?
+							|| (getHost() && getHost()->isMinimized() ));	// are we hosted in a minimized floater?
+}
+
 void add_timestamped_line(LLViewerTextEditor* edit, const LLString& line, const LLColor4& color)
 {
 	bool prepend_newline = true;