diff options
| author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2016-01-11 19:59:41 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2016-01-11 19:59:41 +0200 |
| commit | 86ee5d92fcacf2fd55706a987c224b83c28f326b (patch) | |
| tree | 557bd40efa4261f12b75b45c86bda718249634a6 /indra/newview/llscriptfloater.cpp | |
| parent | c9c6966364ba59171313ec179b8b19f920ea6888 (diff) | |
| parent | e5887ad1d9385ba980b58e4c0ad78337fec451ab (diff) | |
Merged in andreyl_productengine/viewer-lion-marchcat (pull request #16)
MAINT-6018 [SECURITY] Open URL dialog spam
Diffstat (limited to 'indra/newview/llscriptfloater.cpp')
| -rwxr-xr-x | indra/newview/llscriptfloater.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp index 1d021ec28f..b5b5bc855d 100755 --- a/indra/newview/llscriptfloater.cpp +++ b/indra/newview/llscriptfloater.cpp @@ -420,6 +420,18 @@ void LLScriptFloaterManager::onAddNotification(const LLUUID& notification_id) toggleScriptFloater(notification_id, set_new_message); } +void LLScriptFloaterManager::removeAllNotificationsByOwner(const LLUUID& notification_id) +{ + LLNotificationPtr notification = LLNotifications::instance().find(notification_id); + if (notification != NULL && !notification->isCancelled()) + { + LLSD payload = notification->getPayload(); + LLUUID owner = payload.get("owner_id").asUUID(); + + LLNotifications::instance().cancelByOwner(owner); + } +} + void LLScriptFloaterManager::removeNotification(const LLUUID& notification_id) { LLNotificationPtr notification = LLNotifications::instance().find(notification_id); |