diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-11-23 14:29:07 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-11-23 14:38:32 +0200 |
| commit | 7b7667973b3ecaa857f1013c8084f3159105eec1 (patch) | |
| tree | 66fb3dcb2b2e870cbe1312a17c78961d127db10e /indra/newview/skins | |
| parent | f534e37328e7408b1609c9b78d13c6c749091e53 (diff) | |
DRTVWR-513 Resolved merge conflict from merge with DRTVWR-507
See changes from SL-13119 and SL-13190
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_wearable_list_item.xml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml index 46b8b042d5..20c81c983b 100644 --- a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml +++ b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml @@ -72,14 +72,6 @@ function="Clothing.TakeOff" /> </menu_item_call> <menu_item_call - label="Edit" - layout="topleft" - visible="false" - name="edit"> - <on_click - function="Wearable.Edit" /> - </menu_item_call> - <menu_item_call label="Item Profile" layout="topleft" visible="false" |