added McCabe's pie menu patches

3 files changed, 47 insertions, 28 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
index 85028d5..acbe4f4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
@@ -1,20 +1,41 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <pie_menu name="Attachment Pie">
-        <menu_item_call enabled="false" label="Drop" mouse_opaque="true" name="Drop">
-                <on_click function="Attachment.Drop" />
-                <on_enable function="Attachment.EnableDrop" />
+        <menu_item_call enabled="true" label="Profile..." name="Profile...">
+                <on_click function="ShowAgentProfile" userdata="agent" />
         </menu_item_call>
-        <menu_item_separator />
-        <menu_item_separator />
-        <menu_item_separator />
-        <menu_item_separator />
-        <menu_item_separator />
-        <menu_item_call enabled="false" label="Detach" mouse_opaque="true" name="Detach">
-                <on_click function="Attachment.Detach" />
-                <on_enable function="Attachment.EnableDetach" />
+        <menu_item_call enabled="true" label="Groups..." name="Groups...">
+                <on_click function="ShowAgentGroups" userdata="agent" />
         </menu_item_call>
-        <menu_item_call enabled="false" label="Edit" mouse_opaque="true" name="Edit">
-                <on_click function="Object.Edit" />
-                <on_enable function="EnableEdit" />
+        <menu_item_call enabled="false" label="Touch" mouse_opaque="true" name="Object Touch">
+                        <on_click function="Object.Touch" />
+                        <on_enable function="Object.EnableTouch" userdata="Touch" />
+                </menu_item_call>
+        <menu_item_call enabled="true" label="Stand Up" name="Stand Up">
+                <on_click function="Self.StandUp" userdata="" />
+                <on_enable function="Self.EnableStandUp" />
+        </menu_item_call>
+        <menu_item_call enabled="true" label="Friends..." name="Friends...">
+                <on_click function="ShowFloater" userdata="friends" />
+        </menu_item_call>
+        <menu_item_call enabled="true" label="Gestures..." name="Gestures...">
+                <on_click function="ShowFloater" userdata="gestures" />
+        </menu_item_call>
+        <pie_menu label="More &gt;" name="More &gt;">
+                <menu_item_call enabled="false" label="Detach" mouse_opaque="true" name="Detach">
+                        <on_click function="Attachment.Detach" />
+                        <on_enable function="Attachment.EnableDetach" />
+                </menu_item_call>
+                <menu_item_call enabled="false" label="Drop" mouse_opaque="true" name="Drop">
+                        <on_click function="Attachment.Drop" />
+                        <on_enable function="Attachment.EnableDrop" />
+                </menu_item_call>
+                <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit...">
+                        <on_click function="Object.Edit" />
+                        <on_enable function="EnableEdit" />
+                </menu_item_call>
+        </pie_menu>
+        <menu_item_call enabled="true" label="Appearance..." name="Appearance...">
+                <on_click function="ShowFloater" userdata="appearance" />
+                <on_enable function="Edit.EnableCustomizeAvatar" />
         </menu_item_call>
 </pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
index c5a04ce..df9b2a0 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
@@ -53,11 +53,11 @@
                         </menu_item_call>
                         <menu_item_separator />
                         <menu_item_separator />
-                        <menu_item_separator />
                         <menu_item_call enabled="false" label="Mute" mouse_opaque="true" name="Object Mute">
                                 <on_click function="Object.Mute" />
                                 <on_enable function="Object.EnableMute" />
                         </menu_item_call>
+                        <menu_item_separator />
                         <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/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml
index 327e22e..1a6c66c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml
@@ -6,19 +6,6 @@
         <menu_item_call enabled="true" label="Groups..." name="Groups...">
                 <on_click function="ShowAgentGroups" userdata="agent" />
         </menu_item_call>
-        <menu_item_call enabled="true" label="Go..." name="Go...">
-                <on_click function="ShowFloater" userdata="movement controls" />
-        </menu_item_call>
-        <menu_item_call enabled="true" label="Stand Up" name="Stand Up">
-                <on_click function="Self.StandUp" userdata="" />
-                <on_enable function="Self.EnableStandUp" />
-        </menu_item_call>
-        <menu_item_call enabled="true" label="Friends..." name="Friends...">
-                <on_click function="ShowFloater" userdata="friends" />
-        </menu_item_call>
-        <menu_item_call enabled="true" label="Gestures..." name="Gestures...">
-                <on_click function="ShowFloater" userdata="gestures" />
-        </menu_item_call>
         <pie_menu enabled="true" label="Take Off &gt;" name="Take Off &gt;">
                 <pie_menu enabled="true" label="Clothes &gt;" name="Clothes &gt;">
                         <menu_item_call bottom="-29" enabled="false" height="19" label="Shirt" left="0"
@@ -85,6 +72,17 @@
                         <on_enable function="Self.EnableRemoveAllAttachments" />
                 </menu_item_call>
         </pie_menu>
+        <menu_item_call enabled="true" label="Stand Up" name="Stand Up">
+                <on_click function="Self.StandUp" userdata="" />
+                <on_enable function="Self.EnableStandUp" />
+        </menu_item_call>
+        <menu_item_call enabled="true" label="Friends..." name="Friends...">
+                <on_click function="ShowFloater" userdata="friends" />
+        </menu_item_call>
+        <menu_item_call enabled="true" label="Gestures..." name="Gestures...">
+                <on_click function="ShowFloater" userdata="gestures" />
+        </menu_item_call>
+        <menu_item_separator />
         <menu_item_call enabled="true" label="Appearance..." name="Appearance...">
                 <on_click function="ShowFloater" userdata="appearance" />
                 <on_enable function="Edit.EnableCustomizeAvatar" />