From 011b0b0e5e72800d2b3f0fb08d820cc7e23fcb61 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 17:00:33 +0000
Subject: Fix silent merge conflict.... AFAICT.

---
 .../skins/default/xui/en/floater_inventory.xml     | 21 ---------------------
 .../skins/default/xui/en/menu_inventory_add.xml    | 22 +++++++++++++++++++++-
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/floater_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml
index 6d4620f9ab..e187eabd3a 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory.xml
@@ -41,25 +41,4 @@
 	 name="Inventory Panel"
 	 top="15"
 	 width="467" />
-              <menu_item_call
-                 label="Model (L$[COST])..."
-                 layout="topleft"
-                 name="Upload Model">
-                <menu_item_call.on_click
-                 function="File.UploadModel"
-                 parameter="" />
-                <menu_item_call.on_enable
-                 function="File.EnableUpload" />
-              </menu_item_call>
-              <menu_item_call
-                 label="Scene..."
-                 layout="topleft"
-                 name="Upload Scene">
-                <menu_item_call.on_click
-                 function="File.UploadScene"
-                 parameter="" />
-                <menu_item_call.on_enable
-                 function="File.EnableUpload" />
-              </menu_item_call>
-                <menu_item_call
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index 5ad099e2d9..0d974075f5 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -42,6 +42,26 @@
                     <menu_item_call.on_enable
                      function="File.EnableUpload" />
                 </menu_item_call>
+		<menu_item_call
+                 label="Model (L$[COST])..."
+                 layout="topleft"
+                 name="Upload Model">
+                <menu_item_call.on_click
+                 function="File.UploadModel"
+                 parameter="" />
+                <menu_item_call.on_enable
+                 function="File.EnableUpload" />
+              </menu_item_call>
+              <menu_item_call
+                 label="Scene..."
+                 layout="topleft"
+                 name="Upload Scene">
+                <menu_item_call.on_click
+                 function="File.UploadScene"
+                 parameter="" />
+                <menu_item_call.on_enable
+                 function="File.EnableUpload" />
+              </menu_item_call>
                 <menu_item_call
                  label="Bulk (L$[COST] per file)..."
                  layout="topleft"
@@ -226,4 +246,4 @@
                      parameter="eyes" />
                 </menu_item_call>
             </menu>
-</menu>
\ No newline at end of file
+</menu>
-- 
cgit v1.2.3