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

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

diff --git a/ChangeLog.txt b/ChangeLog.txt
index c375dab..8050f24 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,11 @@
 2009-11-18  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+	* Added "(L$[COST] per texture)" to "Import + Upload..."
+
+	  modified: linden/indra/newview/llviewermenu.cpp
+	  modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+
+
 	* Renamed menu items: "Import Object..." and "Import + Upload..."
 
 	  modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
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