Skip to content
Snippets Groups Projects
Commit 011b0b0e authored by Tofu Linden's avatar Tofu Linden
Browse files

Fix silent merge conflict.... AFAICT.

parent 21db9523
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
indra/newview/skins/default/xui/en/floater_inventory.xml
+ 0
− 21
View file @ 011b0b0e
...@@ -41,25 +41,4 @@ ...@@ -41,25 +41,4 @@
name="Inventory Panel" name="Inventory Panel"
top="15" top="15"
width="467" /> 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> </floater>
indra/newview/skins/default/xui/en/menu_inventory_add.xml
+ 21
− 1
View file @ 011b0b0e
...@@ -41,6 +41,26 @@ ...@@ -41,6 +41,26 @@
parameter="" /> parameter="" />
<menu_item_call.on_enable <menu_item_call.on_enable
function="File.EnableUpload" /> 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>
<menu_item_call <menu_item_call
label="Bulk (L$[COST] per file)..." label="Bulk (L$[COST] per file)..."
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment