From c2046025e35493b4e3c26fbaeb78c48d202aee10 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 10 Apr 2013 05:39:21 -0400
Subject: [PATCH] Tiny fix to the Scripts sub-piemenu

---
 indra/newview/llviewermenu.cpp                                | 1 -
 indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml | 4 ++--
 indra/newview/skins/default/xui/en-us/menu_pie_object.xml     | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index ecb2192fb..ab056132d 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -9379,7 +9379,6 @@ void initialize_menus()
 	addMenu(new LLToolsTakeCopy(), "Tools.TakeCopy");
 	addMenu(new LLToolsTakeCopy(), "Tools.TakeCopy");
 
-	addMenu(new LLScriptDelete(), "Tools.ScriptDelete");
 	// <edit>
 	addMenu(new LLToolsEnableAdminDelete(), "Tools.EnableAdminDelete");
 	addMenu(new LLToolsAdminDelete(), "Tools.AdminDelete");
diff --git a/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml b/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
index b2b51edbc..c5f63dc01 100644
--- a/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
@@ -42,8 +42,8 @@
             <on_enable function="EditableSelected" />
           </menu_item_call>
           <menu_item_call mouse_opaque="true" label="Remove" name="Remove Scripts From Selection">
-            <on_click function="Tools.SelectedScriptAction" userdata="delete" />
-            <on_enable function="EditableSelected" />
+            <on_click function="Tools.ScriptDelete" />
+            <on_enable function="Tools.EnableScriptDelete" />
           </menu_item_call>
           <menu_item_call mouse_opaque="true" label="Count" name="ScriptCount">
             <on_click function="Object.ScriptCount" />
diff --git a/indra/newview/skins/default/xui/en-us/menu_pie_object.xml b/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
index bf5e29b42..c6c714147 100644
--- a/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
@@ -116,8 +116,8 @@
                 <on_enable function="EditableSelected" />
               </menu_item_call>
               <menu_item_call mouse_opaque="true" label="Remove" name="Remove Scripts From Selection">
-                <on_click function="Tools.SelectedScriptAction" userdata="delete" />
-                <on_enable function="EditableSelected" />
+                <on_click function="Tools.ScriptDelete" />
+                <on_enable function="Tools.EnableScriptDelete" />
               </menu_item_call>
               <menu_item_call mouse_opaque="true" label="Count" name="ScriptCount">
                 <on_click function="Object.ScriptCount" />