CHUI-433: Problem: Toasts were not being displayed due to incorrect tracking of the current conversation with focus. Resolution: Now when a conversation gains focus it will set a flag to ignore toasts. And when a conversation loses focus it will set a flag to re-enable toasts.

1 files changed, 4 insertions, 9 deletions

diff --git a/indra/newview/llimconversation.cpp b/indra/newview/llimconversation.cpp
index bd2a2419a8..f4b8d39cd0 100644
--- a/indra/newview/llimconversation.cpp
+++ b/indra/newview/llimconversation.cpp
@@ -202,16 +202,10 @@ void LLIMConversation::onFocusReceived()
 {
 	setBackgroundOpaque(true);
 
-	if (mSessionID.notNull())
+	if (mSessionID.notNull() && isInVisibleChain())
 	{
-		LLChicletBar::getInstance()->getChicletPanel()->setChicletToggleState(mSessionID, true);
-
-		if (getVisible())
-		{
-			// suppress corresponding toast only if this floater is visible and have focus
-			LLIMModel::getInstance()->setActiveSessionID(mSessionID);
-			LLIMModel::instance().sendNoUnreadMessages(mSessionID);
-		}
+        LLIMModel::getInstance()->setActiveSessionID(mSessionID);
+		LLIMModel::instance().sendNoUnreadMessages(mSessionID);
 	}
 
 	LLTransientDockableFloater::onFocusReceived();
@@ -219,6 +213,7 @@ void LLIMConversation::onFocusReceived()
 
 void LLIMConversation::onFocusLost()
 {
+    LLIMModel::getInstance()->resetActiveSessionID();
 	setBackgroundOpaque(false);
 	LLTransientDockableFloater::onFocusLost();
 }