From 9d988f4454556dd911b8cb131b38a7f39023fa0f Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 26 Oct 2011 10:10:05 -0700
Subject: [PATCH] EXP-1461 FIX Incoming Nearby chat not visible in chat
 toasts/bubbles to user when chat window is minimized with chat history opened

---
 indra/newview/llnearbychathandler.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp
index 330a21ef653..c43c95a366d 100644
--- a/indra/newview/llnearbychathandler.cpp
+++ b/indra/newview/llnearbychathandler.cpp
@@ -568,7 +568,8 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg,		// WARNING - not
 	sChatWatcher->post(notification);
 
 
-	if( chat_bar->getVisible() && nearby_chat->getVisible() 
+	if( !chat_bar->isMinimized()
+		&& nearby_chat->isInVisibleChain() 
 		|| ( chat_msg.mSourceType == CHAT_SOURCE_AGENT
 			&& gSavedSettings.getBOOL("UseChatBubbles") )
 		|| !mChannel->getShowToasts() ) // to prevent toasts in Busy mode
-- 
GitLab