diff options
author | Brad Kittenbrink <brad@lindenlab.com> | 2022-03-07 00:19:11 -0800 |
---|---|---|
committer | Brad Kittenbrink <brad@lindenlab.com> | 2022-03-07 00:19:11 -0800 |
commit | 89ab1e4525445d5efc370c381f7c1e18faab8f16 (patch) | |
tree | 3e1326470eddea3310bfd15867c9d54dd3b1652c /indra/newview/llbrowsernotification.cpp | |
parent | 40b80251e48d5f0ae3695d9019261f9e472f3e16 (diff) | |
parent | 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff) |
Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfa
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); |