From a02ad53c73ef7609116c3237cb1a50c36863267c Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Mon, 28 Apr 2014 20:36:46 -0400
Subject: [PATCH] Fix bulk import of notes, scripts and gestures, and clarify
 file menu

---
 indra/newview/llviewermenufile.cpp                    |  7 +++++++
 indra/newview/skins/default/xui/en-us/menu_viewer.xml | 10 +++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index 877bfdce3..483b80ab9 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -870,6 +870,13 @@ void upload_new_resource(const std::string& src_filename, std::string name,
 		asset_type = LLAssetType::AT_ANIMATION;
 		filename = src_filename;
 	}
+	else if(exten == "lsl" || exten == "gesture" || exten == "notecard")
+	{
+		if (exten == "lsl") asset_type = LLAssetType::AT_LSL_TEXT;
+		else if (exten == "gesture") asset_type = LLAssetType::AT_GESTURE;
+		else if (exten == "notecard") asset_type = LLAssetType::AT_NOTECARD;
+		filename = src_filename;
+	}
 	// </edit>
 	else
 	{
diff --git a/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 73199bf03..59bf7cdd3 100644
--- a/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -5,17 +5,17 @@
 	<menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true"
 	    height="263" label="File" left="0" mouse_opaque="false" name="File"
 	    opaque="true" tear_off="true" width="243">
-    <menu_item_call enabled="true" label="Image ([UPLOADFEE])..."
+    <menu_item_call enabled="true" label="Upload Image ([UPLOADFEE])..."
         mouse_opaque="true" name="Upload Image" shortcut="control|U" >
 		<on_click function="File.UploadImage" userdata="" />
 		<on_enable function="File.EnableUpload" />
     </menu_item_call>
-    <menu_item_call label="Sound ([UPLOADFEE])..." name="Upload Sound"
+    <menu_item_call label="Upload Sound ([UPLOADFEE])..." name="Upload Sound"
         mouse_opaque="true" enabled="true" >
         <on_click function="File.UploadSound" userdata="" />
         <on_enable function="File.EnableUpload" />
     </menu_item_call>
-    <menu_item_call label="Animation ([UPLOADFEE])..." name="Upload Animation"
+    <menu_item_call label="Upload Animation ([UPLOADFEE])..." name="Upload Animation"
         mouse_opaque="true" enabled="true"  >
         <on_click function="File.UploadAnim" userdata="" />
         <on_enable function="File.EnableUpload" />
@@ -25,11 +25,11 @@
         <on_click function="File.UploadModel" userdata="" />
         <on_enable function="File.EnableUploadModel" />
     </menu_item_call>
-    <menu_item_call label="Bulk ([UPLOADFEE] per file)..." name="Bulk Upload"
+    <menu_item_call label="Bulk Upload ([UPLOADFEE] per file)..." name="Bulk Upload"
         mouse_opaque="true" enabled="true" >
         <on_click function="File.UploadBulk" userdata="" />
     </menu_item_call>
-	<menu_item_call enabled="false" hidden="false" label="Import XML" mouse_opaque="true" name="Import">
+	<menu_item_call enabled="false" hidden="false" label="Import Object XML" mouse_opaque="true" name="Import">
 		<on_click function="Object.Import" />
 		<on_enable function="Object.EnableImport" />
 	</menu_item_call>