From b3610dd836340a31bd1f5e033047f1d6ee9aa056 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Wed, 18 Nov 2009 22:43:47 -0600
Subject: Renamed menu items: "Import Object..." and "Import + Upload..."

---
 linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'linden/indra/newview')

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 1b36bca..b53cbf3 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
@@ -29,11 +29,12 @@
       <on_click function="File.UploadBulk" userdata="" />
     </menu_item_call>
     <menu_item_separator />
-	  <menu_item_call name="Import" label="Import" enabled="false">
+	  <menu_item_call name="Import" label="Import Object..." enabled="false">
       <on_click function="Object.Import" />
       <on_enable function="Object.EnableImport" />
     </menu_item_call>
-    <menu_item_call name="Upload + Import" label="Upload + Import"
+    <menu_item_call name="ImportUpload"
+                    label="Import + Upload..."
                     enabled="false">
       <on_click function="Object.ImportUpload" />
       <on_enable function="Object.EnableImport" />
-- 
cgit v1.1


From 07354173bfa3d536d4f493cec7dfe06a68fc95cc Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Wed, 18 Nov 2009 22:56:09 -0600
Subject: Added "(L$[COST] per texture)" to "Import + Upload..."

---
 linden/indra/newview/llviewermenu.cpp                        | 1 +
 linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'linden/indra/newview')

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index ecf6fcb..895f488 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -676,6 +676,7 @@ void init_menus()
 	gMenuHolder->childSetLabelArg("Upload Sound", "[COST]", upload_cost);
 	gMenuHolder->childSetLabelArg("Upload Animation", "[COST]", upload_cost);
 	gMenuHolder->childSetLabelArg("Bulk Upload", "[COST]", upload_cost);
+	gMenuHolder->childSetLabelArg("ImportUpload", "[COST]", upload_cost);
 
 	gAFKMenu = gMenuBarView->getChild<LLMenuItemCallGL>("Set Away", TRUE);
 	gBusyMenu = gMenuBarView->getChild<LLMenuItemCallGL>("Set Busy", TRUE);
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 b53cbf3..7d36195 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
@@ -34,7 +34,7 @@
       <on_enable function="Object.EnableImport" />
     </menu_item_call>
     <menu_item_call name="ImportUpload"
-                    label="Import + Upload..."
+                    label="Import + Upload...  (L$[COST] per texture)"
                     enabled="false">
       <on_click function="Object.ImportUpload" />
       <on_enable function="Object.EnableImport" />
-- 
cgit v1.1


From 3a61d201ec8a3c0e2e691708ac20228270b9a1c8 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Wed, 18 Nov 2009 23:03:25 -0600
Subject: Added "File > Export Selected Objects..."

---
 linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'linden/indra/newview')

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 7d36195..078fb56 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
@@ -39,6 +39,11 @@
       <on_click function="Object.ImportUpload" />
       <on_enable function="Object.EnableImport" />
     </menu_item_call>
+    <menu_item_call name="Export" label="Export Selected Objects..."
+                    enabled="false">
+      <on_click function="Object.Export" />
+      <on_enable function="Object.EnableExport" />
+    </menu_item_call>
     <menu_item_separator />
     <menu_item_call name="Close Window"
                     label="Close Window"
-- 
cgit v1.1