From 35b8f7b15ccd1f7a9efd7f5e71b2481ff5245693 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 25 Oct 2011 12:44:04 -0700
Subject: EXP-1452 FIX minimum height of NEARBY CHAT window can be circumvented
 by minimizing it.

---
 indra/newview/llnearbychatbar.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp
index a811332261..e7f3daa1a3 100644
--- a/indra/newview/llnearbychatbar.cpp
+++ b/indra/newview/llnearbychatbar.cpp
@@ -147,12 +147,12 @@ LLNearbyChatBar* LLNearbyChatBar::getInstance()
 
 void LLNearbyChatBar::showHistory()
 {
+	openFloater();
+
 	if (!getChildView("nearby_chat")->getVisible())
 	{
 		onToggleNearbyChatPanel();
 	}
-	
-	openFloater();
 }
 
 void LLNearbyChatBar::draw()
@@ -379,7 +379,10 @@ void LLNearbyChatBar::onToggleNearbyChatPanel()
 
 	if (nearby_chat->getVisible())
 	{
-		mExpandedHeight = getRect().getHeight();
+		if (!isMinimized())
+		{
+			mExpandedHeight = getRect().getHeight();
+		}
 		setResizeLimits(getMinWidth(), COLLAPSED_HEIGHT);
 		nearby_chat->setVisible(FALSE);
 		reshape(getRect().getWidth(), COLLAPSED_HEIGHT);
-- 
cgit v1.2.3


From b0df4f12040152afe0813875eddfe83a078079a2 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 26 Oct 2011 11:51:52 -0700
Subject: EXP-1461 FIX Incoming Nearby chat not visible in chat toasts/bubbles
 to user when chat window is minimized with chat history opened made
 minimizing and unminimizing nearby chat floater do the right thing

---
 indra/newview/llnearbychatbar.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

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

diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp
index e7f3daa1a3..4674c85324 100644
--- a/indra/newview/llnearbychatbar.cpp
+++ b/indra/newview/llnearbychatbar.cpp
@@ -399,6 +399,15 @@ void LLNearbyChatBar::onToggleNearbyChatPanel()
 	}
 }
 
+void LLNearbyChatBar::setMinimized(BOOL b)
+{
+	if (b != LLFloater::isMinimized())
+	{
+		LLFloater::setMinimized(b);
+		getChildView("nearby_chat")->setVisible(!b);
+	}
+}
+
 void LLNearbyChatBar::onChatBoxCommit()
 {
 	if (mChatBox->getText().length() > 0)
-- 
cgit v1.2.3