diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-24 01:23:52 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-24 01:23:52 +0300 |
| commit | 7373fd91fa42b3fce0804ccd10899a5d1fdb5c36 (patch) | |
| tree | 54a107f3415c04e6e493f54e156c3ac278d36f99 /indra/newview/skins/default/xui/tr/floater_perm_prefs.xml | |
| parent | 264d9c32d9e04df0ceeaf2a63f6872aad29dd46a (diff) | |
| parent | d454512050e636a19e4b7545515dea4f4b1bbf0d (diff) | |
Merge remote-tracking branch 'origin/main' into DRTVWR-489
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/llxml/llcontrol.cpp
# indra/newview/llpanelnearbymedia.cpp
# indra/newview/llsceneview.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llstartup.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
Diffstat (limited to 'indra/newview/skins/default/xui/tr/floater_perm_prefs.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/tr/floater_perm_prefs.xml | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/indra/newview/skins/default/xui/tr/floater_perm_prefs.xml b/indra/newview/skins/default/xui/tr/floater_perm_prefs.xml deleted file mode 100644 index 669b833c26..0000000000 --- a/indra/newview/skins/default/xui/tr/floater_perm_prefs.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="perm prefs" title="VARSAYILAN KARŞIYA YÜKLEME İZİNLERİ"> - <panel label="İzinler" name="permissions"> - <check_box label="Grupla paylaş" name="share_with_group"/> - <check_box label="Herkese kopyalama izni ver" name="everyone_copy"/> - <text name="NextOwnerLabel"> - Sonraki sahip şunu yapabilir: - </text> - <check_box label="Değiştir" name="next_owner_modify"/> - <check_box label="Kopyala" name="next_owner_copy"/> - <check_box initial_value="true" label="Tekrar sat/Ver" name="next_owner_transfer"/> - </panel> - <button label="Tamam" label_selected="Tamam" name="ok"/> - <button label="İptal" label_selected="İptal" name="cancel"/> -</floater> |