From 3e80fa3dbc943de9b784fedc202ba38cf238f46d Mon Sep 17 00:00:00 2001
From: David Parks <davep@lindenlab.com>
Date: Mon, 2 Nov 2009 19:55:37 +0000
Subject: Sync up with render-pipeline-7 ignore-dead-branch

---
 indra/newview/skins/default/xui/en/floater_inventory.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/floater_inventory.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml
index 0f06558dd1..6afeb4e82d 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory.xml
@@ -123,6 +123,16 @@
                     <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="Animation (L$[COST])..."
                  layout="topleft"
-- 
cgit v1.2.3


From 7fa698252060a72be6b5ebc52f0ff01bcea6134c Mon Sep 17 00:00:00 2001
From: "Karl Stiefvater (qarl)" <qarl@lindenlab.com>
Date: Mon, 9 Nov 2009 17:57:21 -0600
Subject: super importer stuff (gui, texture upload, etc.)

---
 indra/newview/skins/default/xui/en/floater_inventory.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/floater_inventory.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml
index c7fcacab8b..5e324f1c6e 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory.xml
@@ -135,6 +135,16 @@
                  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="Animation (L$[COST])..."
-- 
cgit v1.2.3