CHUI-499: Now when existing DND mode, stored IM's will not show a toast but instead flash the conversation line item and Chat FUI button.

1 files changed, 48 insertions, 38 deletions

diff --git a/indra/newview/llimhandler.cpp b/indra/newview/llimhandler.cpp
index 72967eb6c7..c2b29f36e8 100644
--- a/indra/newview/llimhandler.cpp
+++ b/indra/newview/llimhandler.cpp
@@ -36,6 +36,8 @@
 
 using namespace LLNotificationsUI;
 
+extern void process_dnd_im(const LLSD& notification);
+
 //--------------------------------------------------------------------------
 LLIMHandler::LLIMHandler()
 :	LLCommunicationNotificationHandler("IM Notifications", "notifytoast")
@@ -60,44 +62,52 @@ void LLIMHandler::initChannel()
 //--------------------------------------------------------------------------
 bool LLIMHandler::processNotification(const LLNotificationPtr& notification)
 {
-	if(mChannel.isDead())
-	{
-		return false;
-	}
-
-	// arrange a channel on a screen
-	if(!mChannel.get()->getVisible())
-	{
-		initChannel();
-	}
-
-	LLSD substitutions = notification->getSubstitutions();
-
-	// According to comments in LLIMMgr::addMessage(), if we get message
-	// from ourselves, the sender id is set to null. This fixes EXT-875.
-	LLUUID avatar_id = substitutions["FROM_ID"].asUUID();
-	if (avatar_id.isNull())
-		avatar_id = gAgentID;
-
-	LLToastIMPanel::Params im_p;
-	im_p.notification = notification;
-	im_p.avatar_id = avatar_id;
-	im_p.from = substitutions["FROM"].asString();
-	im_p.time = substitutions["TIME"].asString();
-	im_p.message = substitutions["MESSAGE"].asString();
-	im_p.session_id = substitutions["SESSION_ID"].asUUID();
-
-	LLToastIMPanel* im_box = new LLToastIMPanel(im_p);
-
-	LLToast::Params p;
-	p.notif_id = notification->getID();
-	p.session_id = im_p.session_id;
-	p.notification = notification;
-	p.panel = im_box;
-	p.can_be_stored = false;
-	LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get());
-	if(channel)
-		channel->addToast(p);
+    if(notification->isDND())
+    {
+        LLSD data = notification->asLLSD(); //don't need this if retrieve needed data from notification getters
+        process_dnd_im(data);
+    }
+    else
+    {
+	    if(mChannel.isDead())
+	    {
+		    return false;
+	    }
+
+	    // arrange a channel on a screen
+	    if(!mChannel.get()->getVisible())
+	    {
+		    initChannel();
+	    }
+
+	    LLSD substitutions = notification->getSubstitutions();
+
+	    // According to comments in LLIMMgr::addMessage(), if we get message
+	    // from ourselves, the sender id is set to null. This fixes EXT-875.
+	    LLUUID avatar_id = substitutions["FROM_ID"].asUUID();
+	    if (avatar_id.isNull())
+		    avatar_id = gAgentID;
+
+	    LLToastIMPanel::Params im_p;
+	    im_p.notification = notification;
+	    im_p.avatar_id = avatar_id;
+	    im_p.from = substitutions["FROM"].asString();
+	    im_p.time = substitutions["TIME"].asString();
+	    im_p.message = substitutions["MESSAGE"].asString();
+	    im_p.session_id = substitutions["SESSION_ID"].asUUID();
+
+	    LLToastIMPanel* im_box = new LLToastIMPanel(im_p);
+
+	    LLToast::Params p;
+	    p.notif_id = notification->getID();
+	    p.session_id = im_p.session_id;
+	    p.notification = notification;
+	    p.panel = im_box;
+	    p.can_be_stored = false;
+	    LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get());
+	    if(channel)
+		    channel->addToast(p);
+    }
 
 	return false;
 }