From 29cb3a4a93543c41b23ba429c4d04189c24d30fc Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Mon, 11 Jan 2016 03:24:36 +0200
Subject: MAINT-6018 Open URL dialog spam Added the ability to close all
 notifications from one owner at once

---
 indra/newview/llchiclet.cpp                                |  4 ++++
 indra/newview/llscriptfloater.cpp                          | 12 ++++++++++++
 indra/newview/llscriptfloater.h                            |  5 +++++
 indra/newview/skins/default/xui/en/menu_script_chiclet.xml |  8 ++++++++
 4 files changed, 29 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index dedb06c945..ad26bbd491 100755
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -1092,6 +1092,10 @@ void LLScriptChiclet::onMenuItemClicked(const LLSD& user_data)
 	{
 		LLScriptFloaterManager::instance().removeNotification(getSessionId());
 	}
+	else if ("end_owner" == action)
+	{
+		LLScriptFloaterManager::instance().removeAllNotificationsByOwner(getSessionId());
+	}
 }
 
 void LLScriptChiclet::createPopupMenu()
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);
diff --git a/indra/newview/llscriptfloater.h b/indra/newview/llscriptfloater.h
index 70451194b3..bb35526cf7 100755
--- a/indra/newview/llscriptfloater.h
+++ b/indra/newview/llscriptfloater.h
@@ -59,6 +59,11 @@ public:
 	 */
 	void onAddNotification(const LLUUID& notification_id);
 
+	/**
+	* Removes all notifications by owner id.
+	*/
+	void removeAllNotificationsByOwner(const LLUUID& notification_id);
+
 	/**
 	 * Removes notification.
 	 */
diff --git a/indra/newview/skins/default/xui/en/menu_script_chiclet.xml b/indra/newview/skins/default/xui/en/menu_script_chiclet.xml
index db29d9cebc..ceeef1cd46 100755
--- a/indra/newview/skins/default/xui/en/menu_script_chiclet.xml
+++ b/indra/newview/skins/default/xui/en/menu_script_chiclet.xml
@@ -16,4 +16,12 @@
          function="ScriptChiclet.Action"
          parameter="end" />
     </menu_item_call>
+	<menu_item_call
+	 label="Close by owner"
+	 layout="topleft"
+	 name="CloseByOwner">
+		<menu_item_call.on_click
+		 function="ScriptChiclet.Action"
+		 parameter="end_owner" />
+	</menu_item_call>
 </menu>
-- 
cgit v1.2.3


From e5887ad1d9385ba980b58e4c0ad78337fec451ab Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Mon, 11 Jan 2016 03:35:24 +0200
Subject: MAINT-6018 Open URL dialog spam Remove notifications of muted agents

---
 indra/newview/llmutelist.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/llmutelist.cpp b/indra/newview/llmutelist.cpp
index d79baf90e7..3f4f2446e8 100755
--- a/indra/newview/llmutelist.cpp
+++ b/indra/newview/llmutelist.cpp
@@ -315,6 +315,11 @@ BOOL LLMuteList::add(const LLMute& mute, U32 flags)
 				{
 					LLPipeline::removeMutedAVsLights(avatarp);
 				}
+				//remove agent's notifications as well
+				if (localmute.mType == LLMute::AGENT)
+				{
+					LLNotifications::instance().cancelByOwner(localmute.mID);
+				}
 				return TRUE;
 			}
 		}
-- 
cgit v1.2.3