diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2012-09-08 18:56:43 -0400 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2012-09-08 18:56:43 -0400 |
commit | 4091e47cf206a41cac7ee440b8fd2e2898006685 (patch) | |
tree | 61de24d7aa90171a5fb6481189567fe408d03786 /indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml | |
parent | 81b9e29a1fe227c8f51c6a644b4e2e1afa6bcfb2 (diff) | |
parent | 09cd2a4b1a9f1ddf046fb0ce5d12988b968269a3 (diff) |
DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.
cmake and other files didn't get moved over, do it by hand.
Diffstat (limited to 'indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml')
-rw-r--r-- | indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml index 67bf9071b3..889425f23a 100644 --- a/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml @@ -19,6 +19,8 @@ <button label="Varsayılan" label_selected="Varsayılan" name="Default"/> <button label="Boş" label_selected="Boş" name="Blank"/> <button label="Hiçbiri" label_selected="Hiçbiri" name="None"/> + <check_box initial_value="true" label="Canlı Önizleme" name="apply_immediate_check"/> + <text name="preview_disabled" value="Önizleme Devre Dışı"/> <filter_editor label="Dokuları Filtrele" name="inventory search editor"/> <check_box initial_value="false" label="Klasörleri göster" name="show_folders_check"/> <button label="Ekle" label_selected="Ekle" name="l_add_btn"/> @@ -30,5 +32,4 @@ </scroll_list> <button label="Tamam" label_selected="Tamam" name="Select"/> <button label="İptal" label_selected="İptal" name="Cancel"/> - <check_box initial_value="true" label="Şimdi uygula" name="apply_immediate_check"/> </floater> |