diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-01 08:16:58 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-01 08:16:58 +0300 |
| commit | 38c2a5bde985a6a8a96d912d432f8bdf7e5b60be (patch) | |
| tree | b3469444ea8dabe4e76a8a265ac086a9db78891c /indra/newview/llbrowsernotification.cpp | |
| parent | 9bf2dfbb39032d7407295089cf181de0987083e5 (diff) | |
| parent | e7eced3c87310b15ac20cc3cd470d67686104a14 (diff) | |
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
Diffstat (limited to 'indra/newview/llbrowsernotification.cpp')
| -rw-r--r-- | indra/newview/llbrowsernotification.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/indra/newview/llbrowsernotification.cpp b/indra/newview/llbrowsernotification.cpp index 036215a845..0cc4cd532c 100644 --- a/indra/newview/llbrowsernotification.cpp +++ b/indra/newview/llbrowsernotification.cpp @@ -5,21 +5,21 @@ * $LicenseInfo:firstyear=2000&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2010, Linden Research, Inc. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; * version 2.1 of the License only. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -36,25 +36,25 @@ using namespace LLNotificationsUI; LLBrowserNotification::LLBrowserNotification() - : LLSystemNotificationHandler("Browser", "browser") + : LLSystemNotificationHandler("Browser", "browser") { } bool LLBrowserNotification::processNotification(const LLNotificationPtr& notification, bool should_log) { - LLUUID media_id = notification->getPayload()["media_id"].asUUID(); - auto media_instance = LLMediaCtrl::getInstance(media_id); - if (media_instance) - { - media_instance->showNotification(notification); - } - else if (LLViewerMediaFocus::instance().getControlsMediaID() == media_id) - { - auto impl = LLViewerMedia::getInstance()->getMediaImplFromTextureID(media_id); - if (impl) - { - impl->showNotification(notification); - } - } - return false; + LLUUID media_id = notification->getPayload()["media_id"].asUUID(); + auto media_instance = LLMediaCtrl::getInstance(media_id); + if (media_instance) + { + media_instance->showNotification(notification); + } + else if (LLViewerMediaFocus::instance().getControlsMediaID() == media_id) + { + auto impl = LLViewerMedia::getInstance()->getMediaImplFromTextureID(media_id); + if (impl) + { + impl->showNotification(notification); + } + } + return false; } |
