From 61f3a060031d840329328fdb5bae3fc90cbdcc93 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Tue, 12 Jan 2016 21:08:27 +0200
Subject: MAINT-6018 Open URL dialog spam Removed "close by owner" item form
 chiclet's right-click menu

---
 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 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index ad26bbd491..dedb06c945 100755
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -1092,10 +1092,6 @@ 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 b5b5bc855d..1d021ec28f 100755
--- a/indra/newview/llscriptfloater.cpp
+++ b/indra/newview/llscriptfloater.cpp
@@ -420,18 +420,6 @@ 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 bb35526cf7..70451194b3 100755
--- a/indra/newview/llscriptfloater.h
+++ b/indra/newview/llscriptfloater.h
@@ -59,11 +59,6 @@ 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 ceeef1cd46..db29d9cebc 100755
--- a/indra/newview/skins/default/xui/en/menu_script_chiclet.xml
+++ b/indra/newview/skins/default/xui/en/menu_script_chiclet.xml
@@ -16,12 +16,4 @@
          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