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 39d48e446..b2b51edbc 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
@@ -20,10 +20,36 @@
 		<on_enable function="Attachment.EnableDetach" />
 	</menu_item_call>
 	<pie_menu label="Tools &gt;" name="Tools &gt;">
-		<menu_item_call enabled="false" hidden="false" label="S. Count" mouse_opaque="true" name="ScriptCount">
-			<on_click function="Object.ScriptCount" />
-			<on_visible function="Object.VisibleScriptCount" />
-		</menu_item_call>
+        <pie_menu label="Scripts &gt;" name="ScriptsMenu">
+          <menu_item_call mouse_opaque="true" label="Make Mono" name="CompileMono">
+            <on_click function="Tools.SelectedScriptAction" userdata="compile mono" />
+            <on_enable function="EditableSelectedMono" />
+          </menu_item_call>
+          <menu_item_call mouse_opaque="true" label="Make LSL" name="CompileLSL">
+            <on_click function="Tools.SelectedScriptAction" userdata="compile lsl" />
+            <on_enable function="EditableSelected" />
+          </menu_item_call>
+          <menu_item_call mouse_opaque="true" label="Reset" name="Reset Scripts">
+            <on_click function="Tools.SelectedScriptAction" userdata="reset" />
+            <on_enable function="EditableSelected" />
+          </menu_item_call>
+          <menu_item_call mouse_opaque="true" label="Start" name="Object Set Scripts to Running">
+            <on_click function="Tools.SelectedScriptAction" userdata="start" />
+            <on_enable function="EditableSelected" />
+          </menu_item_call>
+          <menu_item_call mouse_opaque="true" label="Stop" name="Object Set Scripts to Not Running">
+            <on_click function="Tools.SelectedScriptAction" userdata="stop" />
+            <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" />
+          </menu_item_call>
+          <menu_item_call mouse_opaque="true" label="Count" name="ScriptCount">
+            <on_click function="Object.ScriptCount" />
+            <on_visible function="Object.VisibleScriptCount" />
+          </menu_item_call>
+        </pie_menu>
 		<menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
 			<on_click function="Object.Inspect" />
 			<on_enable function="Object.EnableInspect"/>
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 1fe97740f..bf5e29b42 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
@@ -60,15 +60,6 @@
 				<menu_item_call enabled="true" hidden="false" label="Data" mouse_opaque="true" name="Data">
 					<on_click function="Object.Data" />
 				</menu_item_call>
-				<menu_item_call enabled="false" hidden="false" label="S. Count" mouse_opaque="true" name="ScriptCount">
-					<on_click function="Object.ScriptCount" />
-					<on_visible function="Object.VisibleScriptCount" />
-				</menu_item_call>
-				<menu_item_call bottom="-487" enabled="false" height="19" label="Reset Scripts"
-					left="0" mouse_opaque="true" name="Reset Scripts" width="250">
-					<on_click function="Tools.SelectedScriptAction" userdata="reset" />
-					<on_enable function="EditableSelected" />
-				</menu_item_call>
 				<menu_item_call enabled="false" hidden="false" label="Export" mouse_opaque="true" name="Export">
 						<on_click function="Object.Export" />
 						<on_enable function="Object.EnableExport" />
@@ -102,6 +93,36 @@
                 <on_click function="Pathfinding.Characters.Select" />
                 <on_enable function="EnableSelectInPathfindingCharacters"/>
               </menu_item_call>
+            </pie_menu>
+            <pie_menu label="Scripts &gt;" name="ScriptsMenu">
+              <menu_item_call mouse_opaque="true" label="Make Mono" name="CompileMono">
+                <on_click function="Tools.SelectedScriptAction" userdata="compile mono" />
+                <on_enable function="EditableSelectedMono" />
+              </menu_item_call>
+              <menu_item_call mouse_opaque="true" label="Make LSL" name="CompileLSL">
+                <on_click function="Tools.SelectedScriptAction" userdata="compile lsl" />
+                <on_enable function="EditableSelected" />
+              </menu_item_call>
+              <menu_item_call mouse_opaque="true" label="Reset" name="Reset Scripts">
+                <on_click function="Tools.SelectedScriptAction" userdata="reset" />
+                <on_enable function="EditableSelected" />
+              </menu_item_call>
+              <menu_item_call mouse_opaque="true" label="Start" name="Object Set Scripts to Running">
+                <on_click function="Tools.SelectedScriptAction" userdata="start" />
+                <on_enable function="EditableSelected" />
+              </menu_item_call>
+              <menu_item_call mouse_opaque="true" label="Stop" name="Object Set Scripts to Not Running">
+                <on_click function="Tools.SelectedScriptAction" userdata="stop" />
+                <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" />
+              </menu_item_call>
+              <menu_item_call mouse_opaque="true" label="Count" name="ScriptCount">
+                <on_click function="Object.ScriptCount" />
+                <on_visible function="Object.VisibleScriptCount" />
+              </menu_item_call>
             </pie_menu>
 		</pie_menu>
 		<menu_item_call enabled="false" label="Buy..." mouse_opaque="true" name="Buy...">