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
No related branches found
No related tags found
No related merge requests found
......@@ -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>
......@@ -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>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment