diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-05 00:37:16 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-05 00:37:16 +0300 |
| commit | ec9b9898635e90dcdc3579e2121ef11f8ca2a0a8 (patch) | |
| tree | 859eb8101847d3c8be18adc6bf9aa0e775a792e7 /indra/newview/skins/default/xui/it/floater_texture_ctrl.xml | |
| parent | 80447f5e6bfd9843413c7a79074d11373e6c4061 (diff) | |
| parent | 7c0f3db180e50aad3866a8ac1b1c88cccf74c68d (diff) | |
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
Diffstat (limited to 'indra/newview/skins/default/xui/it/floater_texture_ctrl.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/it/floater_texture_ctrl.xml | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml index 8a7569adfa..f857bfe49f 100644 --- a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml @@ -16,7 +16,6 @@ <button label="Default" label_selected="Default" name="Default"/> <button label="Vuoto" label_selected="Vuoto" name="Blank"/> <button label="Niente" label_selected="Niente" name="None"/> - <check_box initial_value="true" label="Applica adesso" name="apply_immediate_check"/> <text name="preview_disabled" value="Anteprima disattivata"/> <filter_editor label="Filtro texture" name="inventory search editor"/> <check_box initial_value="false" label="Mostra cartelle" name="show_folders_check"/> @@ -27,6 +26,22 @@ <column label="Nome" name="unit_name"/> <column label="ID" name="unit_id_HIDDEN"/> </scroll_list> + <combo_box name="l_bake_use_texture_combo_box" tool_tip="Scegli la bake della texture"> + <combo_box.item label="Nessuna" name="None"/> + <combo_box.item label="BAKED_HEAD" name="BAKED_HEAD"/> + <combo_box.item label="BAKED_UPPER" name="BAKED_UPPER"/> + <combo_box.item label="BAKED_LOWER" name="BAKED_LOWER"/> + <combo_box.item label="BAKED_EYES" name="BAKED_EYES"/> + <combo_box.item label="BAKED_SKIRT" name="BAKED_SKIRT"/> + <combo_box.item label="BAKED_HAIR" name="BAKED_HAIR"/> + <combo_box.item label="BAKED_LEFTARM" name="BAKED_LEFTARM"/> + <combo_box.item label="BAKED_LEFTLEG" name="BAKED_LEFTLEG"/> + <combo_box.item label="BAKED_AUX1" name="BAKED_AUX1"/> + <combo_box.item label="BAKED_AUX2" name="BAKED_AUX2"/> + <combo_box.item label="BAKED_AUX3" name="BAKED_AUX3"/> + </combo_box> + <check_box initial_value="false" label="Nascondi regione mesh base" name="hide_base_mesh_region"/> <button label="OK" label_selected="OK" name="Select"/> <button label="Annulla" label_selected="Annulla" name="Cancel"/> + <check_box initial_value="true" label="Applica adesso" name="apply_immediate_check"/> </floater> |