summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-02 13:24:42 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-02 13:24:42 +0100
commit6fbe144e4cf578bb76c4e015c191300c17ac44fe (patch)
tree518ae6c2a24c355b8ee141832c87ddea88a92f38
parent9c715190ef9497212834452dbfd3c28856e7b044 (diff)
merge fix
-rw-r--r--indra/newview/skins/default/xui/en/panel_main_inventory.xml10
1 files changed, 0 insertions, 10 deletions
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"