From dde030e6cd8816bb7f99e0358a8c83eaccf1f8b9 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Fri, 1 Feb 2013 11:18:23 -0800
Subject: [PATCH] CHUI-689: When DND mode is enabled, making a direct delivery
purchase results in an IM message from '(Nobody)'. Solution: Fixed a problem
in process_improved_im that would falsy use system messages while in DND mode
as an IM from a user. Also made it so that while in DND mode, SystemMessages
and message with a high or greater priority are shown to the user as toasts
(before a notification chiclet would just appear without the toast).
---
indra/newview/llnotificationscripthandler.cpp | 5 +++++
indra/newview/llviewermessage.cpp | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llnotificationscripthandler.cpp b/indra/newview/llnotificationscripthandler.cpp
index e2d4e9f8ce5..19dd6d4ca09 100644
--- a/indra/newview/llnotificationscripthandler.cpp
+++ b/indra/newview/llnotificationscripthandler.cpp
@@ -27,6 +27,7 @@
#include "llviewerprecompiledheaders.h" // must be first include
+#include "llagent.h"
#include "llnotificationhandler.h"
#include "lltoastnotifypanel.h"
#include "llviewercontrol.h"
@@ -95,6 +96,10 @@ bool LLScriptHandler::processNotification(const LLNotificationPtr& notification)
p.notification = notification;
p.panel = notify_box;
p.on_delete_toast = boost::bind(&LLScriptHandler::onDeleteToast, this, _1);
+ if(gAgent.isDoNotDisturb())
+ {
+ p.force_show = notification->getName() == "SystemMessage" || notification->getPriority() >= NOTIFICATION_PRIORITY_HIGH;
+ }
LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get());
if(channel)
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index caafb10e258..359819ec493 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2391,7 +2391,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
// do nothing -- don't distract newbies in
// Prelude with global IMs
}
- else if (offline == IM_ONLINE && is_do_not_disturb && name != SYSTEM_FROM)
+ else if (offline == IM_ONLINE && is_do_not_disturb && from_id.notNull())
{
// return a standard "do not disturb" message, but only do it to online IM
// (i.e. not other auto responses and not store-and-forward IM)
--
GitLab