Skip to content
Snippets Groups Projects
Commit 66da7af7 authored by Andrey Kleshchev's avatar Andrey Kleshchev Committed by akleshchev
Browse files

SL-20453 Fix dupplicate items in menu 

Cleanup. Caused by a merge of main(D567) into D559
parent ea67abf7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/skins/default/xui/en/menu_inventory.xml
+ 8
− 279
View file @ 66da7af7
...@@ -466,285 +466,6 @@ ...@@ -466,285 +466,6 @@
function="Inventory.DoToSelected" function="Inventory.DoToSelected"
parameter="delete_system_folder" /> parameter="delete_system_folder" />
</menu_item_call> </menu_item_call>
<menu_item_separator
layout="topleft"
name="Create Separator" />
<menu_item_call
label="New Folder"
layout="topleft"
name="New Folder">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="category" />
</menu_item_call>
<menu_item_call
label="New Outfit"
layout="topleft"
name="New Outfit">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="outfit" />
</menu_item_call>
<menu_item_call
label="New Script"
layout="topleft"
name="New Script">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="lsl" />
</menu_item_call>
<menu_item_call
label="New Notecard"
layout="topleft"
name="New Note">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="notecard" />
</menu_item_call>
<menu_item_call
label="New Gesture"
layout="topleft"
name="New Gesture">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="gesture" />
</menu_item_call>
<menu_item_call
label="New Material"
layout="topleft"
name="New Material">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="material" />
<menu_item_call.on_enable
function="Inventory.MaterialsEnabled" />
</menu_item_call>
<menu
label="New Clothes"
layout="topleft"
name="New Clothes">
<menu_item_call
label="New Shirt"
layout="topleft"
name="New Shirt">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="shirt" />
</menu_item_call>
<menu_item_call
label="New Pants"
layout="topleft"
name="New Pants">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="pants" />
</menu_item_call>
<menu_item_call
label="New Shoes"
layout="topleft"
name="New Shoes">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="shoes" />
</menu_item_call>
<menu_item_call
label="New Socks"
layout="topleft"
name="New Socks">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="socks" />
</menu_item_call>
<menu_item_call
label="New Jacket"
layout="topleft"
name="New Jacket">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="jacket" />
</menu_item_call>
<menu_item_call
label="New Skirt"
layout="topleft"
name="New Skirt">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="skirt" />
</menu_item_call>
<menu_item_call
label="New Gloves"
layout="topleft"
name="New Gloves">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="gloves" />
</menu_item_call>
<menu_item_call
label="New Undershirt"
layout="topleft"
name="New Undershirt">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="undershirt" />
</menu_item_call>
<menu_item_call
label="New Underpants"
layout="topleft"
name="New Underpants">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="underpants" />
</menu_item_call>
<menu_item_call
label="New Alpha Mask"
layout="topleft"
name="New Alpha Mask">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="alpha" />
</menu_item_call>
<menu_item_call
label="New Tattoo"
layout="topleft"
name="New Tattoo">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="tattoo" />
</menu_item_call>
<menu_item_call
label="New Universal"
layout="topleft"
name="New Universal">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="universal" />
</menu_item_call>
<menu_item_call
label="New Physics"
layout="topleft"
name="New Physics">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="physics" />
</menu_item_call>
</menu>
<menu
label="New Body Parts"
layout="topleft"
name="New Body Parts">
<menu_item_call
label="New Shape"
layout="topleft"
name="New Shape">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="shape" />
</menu_item_call>
<menu_item_call
label="New Skin"
layout="topleft"
name="New Skin">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="skin" />
</menu_item_call>
<menu_item_call
label="New Hair"
layout="topleft"
name="New Hair">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="hair" />
</menu_item_call>
<menu_item_call
label="New Eyes"
layout="topleft"
name="New Eyes">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="eyes" />
</menu_item_call>
</menu>
<menu
label="New Settings"
layout="topleft"
name="New Settings">
<menu_item_call
label="New Sky"
layout="topleft"
name="New Sky">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="sky"/>
<menu_item_call.on_enable
function="Inventory.EnvironmentEnabled" />
</menu_item_call>
<menu_item_call
label="New Water"
layout="topleft"
name="New Water">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="water"/>
<menu_item_call.on_enable
function="Inventory.EnvironmentEnabled" />
</menu_item_call>
<menu_item_call
label="New Day Cycle"
layout="topleft"
name="New Day Cycle">
<menu_item_call.on_click
function="Inventory.DoCreate"
parameter="daycycle"/>
<menu_item_call.on_enable
function="Inventory.EnvironmentEnabled" />
</menu_item_call>
</menu>
<menu
label="Use as default for"
layout="topleft"
name="upload_def">
<menu_item_call
label="Image uploads"
layout="topleft"
name="Image uploads">
<menu_item_call.on_click
function="Inventory.FileUploadLocation"
parameter="texture" />
</menu_item_call>
<menu_item_call
label="Sound uploads"
layout="topleft"
name="Sound uploads">
<menu_item_call.on_click
function="Inventory.FileUploadLocation"
parameter="sound" />
</menu_item_call>
<menu_item_call
label="Animation uploads"
layout="topleft"
name="Animation uploads">
<menu_item_call.on_click
function="Inventory.FileUploadLocation"
parameter="animation" />
</menu_item_call>
<menu_item_call
label="Model uploads"
layout="topleft"
name="Model uploads">
<menu_item_call.on_click
function="Inventory.FileUploadLocation"
parameter="model" />
</menu_item_call>
<menu_item_call
label="PBR material uploads"
layout="topleft"
name="PBR uploads">
<menu_item_call.on_click
function="Inventory.FileUploadLocation"
parameter="pbr_material" />
</menu_item_call>
</menu>
<menu_item_separator <menu_item_separator
layout="topleft" /> layout="topleft" />
<menu_item_separator <menu_item_separator
...@@ -1030,6 +751,14 @@ ...@@ -1030,6 +751,14 @@
function="Inventory.FileUploadLocation" function="Inventory.FileUploadLocation"
parameter="model" /> parameter="model" />
</menu_item_call> </menu_item_call>
<menu_item_call
label="PBR material uploads"
layout="topleft"
name="PBR uploads">
<menu_item_call.on_click
function="Inventory.FileUploadLocation"
parameter="pbr_material" />
</menu_item_call>
</menu> </menu>
<menu_item_separator <menu_item_separator
layout="topleft" layout="topleft"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment