From e143ceb9db4ed716716580d098791cb18b1d5ac1 Mon Sep 17 00:00:00 2001 From: Cho Date: Thu, 29 May 2014 03:04:19 +0100 Subject: Added inelegant fix for ACME-1471 to pop up the old notification with each new notification --- indra/newview/llnotificationscripthandler.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/indra/newview/llnotificationscripthandler.cpp b/indra/newview/llnotificationscripthandler.cpp index 65b1d5f95f..267d3ac092 100755 --- a/indra/newview/llnotificationscripthandler.cpp +++ b/indra/newview/llnotificationscripthandler.cpp @@ -122,8 +122,21 @@ void LLScriptHandler::onChange( LLNotificationPtr notification ) if (channel) { LLToastPanel* notify_box = LLToastPanel::buidPanelFromNotification(notification); - channel->modifyToastByNotificationID(notification->getID(), notify_box); + + LLToast::Params p; + p.notif_id = notification->getID(); + 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->getName() == "GodMessage" + || notification->getPriority() >= NOTIFICATION_PRIORITY_HIGH; + } + channel->removeToastByNotificationID(notification->getID()); + channel->addToast(p); } } -- cgit v1.2.3