summaryrefslogtreecommitdiff
path: root/indra/newview/llnotificationscripthandler.cpp
diff options
context:
space:
mode:
authorNicky <nicky.dasmijn@gmail.com>2022-02-28 22:04:05 +0100
committerNicky <nicky.dasmijn@gmail.com>2022-02-28 22:04:05 +0100
commit43031968a653899f62755b6d7b7e28b7fedc24d9 (patch)
treec610012c5d4e568d94dea4208a80fe1be53ff2bf /indra/newview/llnotificationscripthandler.cpp
parent07d7dcc0be9b793b1bcef63f526b441a58a9b764 (diff)
parent6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff)
Merge remote-tracking branch 'll/master'
Diffstat (limited to 'indra/newview/llnotificationscripthandler.cpp')
-rw-r--r--indra/newview/llnotificationscripthandler.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llnotificationscripthandler.cpp b/indra/newview/llnotificationscripthandler.cpp
index ba831ab2ed..43c3ee3ce2 100644
--- a/indra/newview/llnotificationscripthandler.cpp
+++ b/indra/newview/llnotificationscripthandler.cpp
@@ -92,7 +92,7 @@ void LLScriptHandler::addToastWithNotification(const LLNotificationPtr& notifica
}
//--------------------------------------------------------------------------
-bool LLScriptHandler::processNotification(const LLNotificationPtr& notification)
+bool LLScriptHandler::processNotification(const LLNotificationPtr& notification, bool should_log)
{
if(mChannel.isDead())
{
@@ -105,7 +105,7 @@ bool LLScriptHandler::processNotification(const LLNotificationPtr& notification)
initChannel();
}
- if (notification->canLogToIM())
+ if (should_log && notification->canLogToIM())
{
LLHandlerUtil::logToIMP2P(notification);
}