From 9f0890fc3a6931562843e4597c009778424ee5bc Mon Sep 17 00:00:00 2001
From: leyla_linden <none@none>
Date: Tue, 11 Oct 2011 16:17:23 -0700
Subject: EXP-1293 Nearby chat toasts no longer appear. EXP-1316 Minimized
 Snapshot floater has a snapshot preview image attached below. EXP-1318
 Clicking on nearby chat toasts should bring up Nearby Chat history

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

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

diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp
index dcf444b048..7503164fe6 100644
--- a/indra/newview/llnearbychathandler.cpp
+++ b/indra/newview/llnearbychathandler.cpp
@@ -581,7 +581,7 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg,		// WARNING - not
 	sChatWatcher->post(notification);
 
 
-	if( nearby_chat->getVisible()
+	if( chat_bar->getVisible() && nearby_chat->getVisible() 
 		|| ( chat_msg.mSourceType == CHAT_SOURCE_AGENT
 			&& gSavedSettings.getBOOL("UseChatBubbles") )
 		|| !mChannel->getShowToasts() ) // to prevent toasts in Busy mode
-- 
cgit v1.2.3