diff options
author | Nicky <nicky.dasmijn@gmail.com> | 2022-02-28 22:04:05 +0100 |
---|---|---|
committer | Nicky <nicky.dasmijn@gmail.com> | 2022-02-28 22:04:05 +0100 |
commit | 43031968a653899f62755b6d7b7e28b7fedc24d9 (patch) | |
tree | c610012c5d4e568d94dea4208a80fe1be53ff2bf /indra/newview/llbrowsernotification.cpp | |
parent | 07d7dcc0be9b793b1bcef63f526b441a58a9b764 (diff) | |
parent | 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff) |
Merge remote-tracking branch 'll/master'
Diffstat (limited to 'indra/newview/llbrowsernotification.cpp')
-rw-r--r-- | indra/newview/llbrowsernotification.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llbrowsernotification.cpp b/indra/newview/llbrowsernotification.cpp index 0460bff1b4..7614624306 100644 --- a/indra/newview/llbrowsernotification.cpp +++ b/indra/newview/llbrowsernotification.cpp @@ -40,7 +40,7 @@ LLBrowserNotification::LLBrowserNotification() { } -bool LLBrowserNotification::processNotification(const LLNotificationPtr& notification) +bool LLBrowserNotification::processNotification(const LLNotificationPtr& notification, bool should_log) { LLUUID media_id = notification->getPayload()["media_id"].asUUID(); LLMediaCtrl* media_instance = LLMediaCtrl::getInstance(media_id); |