diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-23 22:40:17 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-23 22:40:17 +0300 |
| commit | 3d73a10da3e051b232b4ddc89c1463a8b097ca7f (patch) | |
| tree | 8b32d955d0628ca1138301177e1413cc419229fd /indra/newview/skins/default/xui/it/menu_name_field.xml | |
| parent | 4b5b048cb6280cbd9fd303acd96fce73461d1fb4 (diff) | |
| parent | d454512050e636a19e4b7545515dea4f4b1bbf0d (diff) | |
Merge branch main (DRTVWR-582) into DRTVWR-567
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventoryobserver.cpp
# indra/newview/llinventoryobserver.h
# indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
Diffstat (limited to 'indra/newview/skins/default/xui/it/menu_name_field.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/it/menu_name_field.xml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/it/menu_name_field.xml b/indra/newview/skins/default/xui/it/menu_name_field.xml deleted file mode 100644 index 9ac863323c..0000000000 --- a/indra/newview/skins/default/xui/it/menu_name_field.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<toggleable_menu name="CopyMenu"> - <menu_item_call label="Copia Nome Visualizzato" name="copy_display"/> - <menu_item_call label="Copia Nome Agente" name="copy_name"/> - <menu_item_call label="Copia ID Agente" name="copy_id"/> -</toggleable_menu> |