From 6fbe144e4cf578bb76c4e015c191300c17ac44fe Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Fri, 2 Apr 2010 13:24:42 +0100
Subject: merge fix

---
 indra/newview/skins/default/xui/en/panel_main_inventory.xml | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 0eea309d35..1b04d01abf 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -38,16 +38,6 @@
 		     width="300">
     Items:
   </text>
-                 label="Model..."
-                 layout="topleft"
-                 name="Upload Model">
-                    <menu_item_call.on_click
-                     function="File.UploadModel"
-                     parameter="" />
-                    <menu_item_call.on_enable
-                     function="File.EnableUploadModel" />
-                </menu_item_call>
-                <menu_item_call
   <filter_editor
    text_pad_left="10"
    follows="left|top|right"
-- 
cgit v1.2.3