From 2033a2b48048c22b0feda136b1a41c4d4fddd4c1 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 12 Aug 2010 13:03:22 -0700
Subject: Don't put Derender at the 6 o'clock position in the pies

---
 .../skins/default/xui/en-us/legacy_menu_pie_avatar.xml   | 16 ++++++++--------
 .../skins/default/xui/en-us/legacy_menu_pie_object.xml   | 16 ++++++++--------
 .../newview/skins/default/xui/en-us/menu_pie_avatar.xml  |  2 +-
 .../newview/skins/default/xui/en-us/menu_pie_object.xml  |  6 +++---
 4 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'linden/indra/newview')

diff --git a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_avatar.xml
index a4d02c0..dcf7521 100644
--- a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_avatar.xml
@@ -37,17 +37,17 @@
 			<on_click function="Avatar.Eject" />
 			<on_enable function="Avatar.EnableFreezeEject" />
 		</menu_item_call>
-		<menu_item_call enabled="false" label="Debug..." mouse_opaque="true" name="Debug...">
-			<on_click function="Avatar.Debug" />
-			<on_visible function="Avatar.VisibleDebug" />
-			<on_enable function="Avatar.EnableDebug" />
-		</menu_item_call>
-		<menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Avatar Inspect">
+    <menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender">
+      <on_click function="Object.DERENDER" />
+    </menu_item_call>
+    <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Avatar Inspect">
 			<on_click function="Object.Inspect" />
 			<on_enable function="Object.EnableInspect" />
 		</menu_item_call>
-    <menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender">
-      <on_click function="Object.DERENDER" />
+    <menu_item_call enabled="false" label="Debug..." mouse_opaque="true" name="Debug...">
+      <on_click function="Avatar.Debug" />
+      <on_visible function="Avatar.VisibleDebug" />
+      <on_enable function="Avatar.EnableDebug" />
     </menu_item_call>
 	</pie_menu>
 	<menu_item_call enabled="false" label="Send IM..." mouse_opaque="true" name="Send IM...">
diff --git a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_object.xml b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_object.xml
index 3da3e16..ff142b5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_object.xml
@@ -65,17 +65,17 @@
         			<on_click function="Tools.Unlink" userdata="" />
         			<on_enable function="Tools.EnableUnlink" />
       			</menu_item_call>
-			<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_call enabled="true" label="Derender" mouse_opaque="true" name="Derender">
         <on_click function="Object.DERENDER" />
       </menu_item_call>
-			<menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
-				<on_click function="Object.Inspect" />
-				<on_enable function="Object.EnableInspect" />
-			</menu_item_call>
+      <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
+        <on_click function="Object.Inspect" />
+        <on_enable function="Object.EnableInspect" />
+      </menu_item_call>
+      <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>
 		</pie_menu>
 		<menu_item_call enabled="false" label="Buy..." mouse_opaque="true" name="Buy...">
 			<on_click function="Object.Buy" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
index 065c2e7..c87d7de 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
@@ -40,10 +40,10 @@
       <on_click function="Object.Inspect" />
       <on_enable function="Object.EnableInspect" />
     </menu_item_call>
-    <menu_item_separator />
     <menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender">
       <on_click function="Object.DERENDER" />
     </menu_item_call>
+    <menu_item_separator />
 		<menu_item_call enabled="false" label="Debug..." mouse_opaque="true" name="Debug...">
 			<on_click function="Avatar.Debug" />
 			<on_visible function="Avatar.VisibleDebug" />
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 d02f7f6..ec828df 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
@@ -66,13 +66,13 @@
         <on_click function="Object.Inspect" />
         <on_enable function="Object.EnableInspect" />
       </menu_item_call>
+      <menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender">
+        <on_click function="Object.DERENDER" />
+      </menu_item_call>
       <menu_item_call name="Link" enabled="false" label="Link">
         <on_click function="Tools.Link" userdata="" />
         <on_enable function="Tools.EnableLink" />
       </menu_item_call>
-      <menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender">
-        <on_click function="Object.DERENDER" />
-      </menu_item_call>
       <menu_item_call name="Unlink" enabled="false" label="Unlink">
         <on_click function="Tools.Unlink" userdata="" />
         <on_enable function="Tools.EnableUnlink" />
-- 
cgit v1.1