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/floater_perm_prefs.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/floater_perm_prefs.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/it/floater_perm_prefs.xml | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/indra/newview/skins/default/xui/it/floater_perm_prefs.xml b/indra/newview/skins/default/xui/it/floater_perm_prefs.xml deleted file mode 100644 index a02b3b5075..0000000000 --- a/indra/newview/skins/default/xui/it/floater_perm_prefs.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="perm prefs" title="DIRITTI DI CARICAMENTO PREDEFINITI"> - <panel label="Permessi" name="permissions"> - <button label="?" label_selected="?" name="help"/> - <check_box label="Condividi con il gruppo" name="share_with_group"/> - <check_box label="Permetti a chiunque di copiare" name="everyone_copy"/> - <text name="NextOwnerLabel"> - Il prossimo possessore può: - </text> - <check_box label="Modificare" name="next_owner_modify"/> - <check_box label="Copiare" name="next_owner_copy"/> - <check_box label="Rivendere/Regalare" name="next_owner_transfer"/> - </panel> - <button label="OK" label_selected="OK" name="ok"/> - <button label="Annulla" label_selected="Annulla" name="cancel"/> -</floater> |