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..."

---
 ChangeLog.txt                                                | 5 +++++
 linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index ce7eb67..c375dab 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,10 @@
 2009-11-18  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+	* Renamed menu items: "Import Object..." and "Import + Upload..."
+
+	  modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+
+
 	* Fixed a compile blocker in LLVoSky::stepCurrent().
 
 	  modified:   linden/indra/newview/llvosky.h
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