Merge commit 'jacek/next' into next

2 files changed, 9 insertions, 2 deletions

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 1b36bca..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
@@ -29,15 +29,21 @@
       <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...  (L$[COST] per texture)"
                     enabled="false">
       <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"