diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-04-21 13:12:05 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-04-21 13:12:05 +0300 |
| commit | a4b1c0330a6a8e43bf4c41c5b0c836bd1dee2268 (patch) | |
| tree | 6d68d3e3f665d60fa946bd24a4b324b5e63339fb /indra/newview/skins/default/xui/it/menu_inventory_add.xml | |
| parent | a8df6762ff88458916397b9707f6954b2714e14d (diff) | |
| parent | d7f1c88c35849e56f5b352f13c16a08467d1533b (diff) | |
Merge branch 'master' into DRTVWR-482
# Conflicts:
# indra/newview/app_settings/shaders/class1/objects/previewV.glsl
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/it/menu_inventory_add.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/it/menu_inventory_add.xml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/it/menu_inventory_add.xml b/indra/newview/skins/default/xui/it/menu_inventory_add.xml index e31f0ebb69..6f9212f56b 100644 --- a/indra/newview/skins/default/xui/it/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/it/menu_inventory_add.xml @@ -5,9 +5,7 @@ <menu_item_call label="Suono ([COST]L$)..." name="Upload Sound"/> <menu_item_call label="Animazione ([COST]L$)..." name="Upload Animation"/> <menu_item_call label="Modella..." name="Upload Model"/> - <menu_item_call label="Procedura guidata modellazione..." name="Upload Model Wizard"/> <menu_item_call label="In blocco..." name="Bulk Upload"/> - <menu_item_call label="Definisci diritti di caricamento predefiniti" name="perm prefs"/> </menu> <menu_item_call label="Nuova cartella" name="New Folder"/> <menu_item_call label="Nuovo script" name="New Script"/> @@ -25,6 +23,7 @@ <menu_item_call label="Nuovi slip" name="New Underpants"/> <menu_item_call label="Nuovo Alfa (trasparenza)" name="New Alpha"/> <menu_item_call label="Nuovo tatuaggio" name="New Tattoo"/> + <menu_item_call label="Nuovo Universale" name="New Universal"/> <menu_item_call label="Nuova fisica" name="New Physics"/> </menu> <menu label="Nuove parti del corpo" name="New Body Parts"> @@ -33,4 +32,9 @@ <menu_item_call label="Nuovi capelli" name="New Hair"/> <menu_item_call label="Nuovi occhi" name="New Eyes"/> </menu> + <menu label="Nuove impostazioni" name="New Settings"> + <menu_item_call label="Nuovo cielo" name="New Sky"/> + <menu_item_call label="Nuova acqua" name="New Water"/> + <menu_item_call label="Nuovo ciclo giornata" name="New Day Cycle"/> + </menu> </menu> |