From e8b38f2336df3835bdc094bdbce17ba6f7ee01e2 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 27 Sep 2009 21:12:39 -0500
Subject: Changed "Backup" to "Export" in object pie menu.

---
 linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linden/indra/newview/skins')

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 15cdc9e..2c7ca3c 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
@@ -44,7 +44,7 @@
 			<on_enable function="Object.EnableReturn" />
 		</menu_item_call>
 		<pie_menu label="More &gt;" name="Rate Menu">
-      <menu_item_call label="Backup" enabled="false" hidden="false"
+      <menu_item_call label="Export" enabled="false" hidden="false"
                       mouse_opaqu="true" name="Export">
         <on_click function="Object.Export" />
         <on_enable function="Object.EnableExport" />
-- 
cgit v1.1


From 24cd4bcf7e1899547692c356bf739981b1c4e56e Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 27 Sep 2009 21:18:08 -0500
Subject: Rearranged the Import stuff in the File menu.

---
 .../newview/skins/default/xui/en-us/menu_viewer.xml    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'linden/indra/newview/skins')

diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 92b7008..9da0ec5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -8,14 +8,6 @@
 
   <menu name="File" create_jump_keys="true" label="File"
         opaque="true" tear_off="true">
-	    <menu_item_call enabled="false" hidden="false" label="Import" mouse_opaque="true" name="Import">
-            <on_click function="Object.Import" />
-            <on_enable function="Object.EnableImport" />
-        </menu_item_call>
-        <menu_item_call enabled="false" hidden="false" label="Upload + Import" mouse_opaque="true" name="Import">
-            <on_click function="Object.ImportUpload" />
-            <on_enable function="Object.EnableImport" />
-    </menu_item_call>
     <menu_item_call name="Upload Image"
                     label="Upload Image (L$[COST])..."
                     shortcut="control|U">
@@ -37,6 +29,16 @@
       <on_click function="File.UploadBulk" userdata="" />
     </menu_item_call>
     <menu_item_separator />
+	  <menu_item_call name="Import" label="Import" enabled="false">
+      <on_click function="Object.Import" />
+      <on_enable function="Object.EnableImport" />
+    </menu_item_call>
+    <menu_item_call name="Upload + Import" label="Upload + Import"
+                    enabled="false">
+      <on_click function="Object.ImportUpload" />
+      <on_enable function="Object.EnableImport" />
+    </menu_item_call>
+    <menu_item_separator />
     <menu_item_call name="Close Window"
                     label="Close Window"
                     shortcut="control|W">
-- 
cgit v1.1