diff options
author | Oz Linden <oz@lindenlab.com> | 2015-07-09 12:30:57 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2015-07-09 12:30:57 -0400 |
commit | c2f9c5ac8189b8076d51711c3be09dfbe309e22b (patch) | |
tree | 0c0a469645c77c62ff0456d2230cb6b2c3e996c0 /indra/newview/skins/default/xui/pt/panel_twitter_photo.xml | |
parent | c91205c47627e46369d3a2e183de7a4157c051a8 (diff) | |
parent | 4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff) |
merge changes for 3.8.0-release
Diffstat (limited to 'indra/newview/skins/default/xui/pt/panel_twitter_photo.xml')
-rw-r--r-- | indra/newview/skins/default/xui/pt/panel_twitter_photo.xml | 50 |
1 files changed, 21 insertions, 29 deletions
diff --git a/indra/newview/skins/default/xui/pt/panel_twitter_photo.xml b/indra/newview/skins/default/xui/pt/panel_twitter_photo.xml index 3958d5f0f9..7c4990f71e 100644 --- a/indra/newview/skins/default/xui/pt/panel_twitter_photo.xml +++ b/indra/newview/skins/default/xui/pt/panel_twitter_photo.xml @@ -1,32 +1,24 @@ <?xml version="1.0" encoding="utf-8"?> <panel name="panel_twitter_photo"> - <layout_stack name="stack_photo"> - <layout_panel name="text_panel"> - <text name="status_label"> - Próximas etapas? - </text> - <text name="status_counter_label"> - 140 - </text> - <check_box initial_value="true" label="Incluir localização do SL" name="add_location_cb"/> - <check_box initial_value="true" label="Incluir uma foto" name="add_photo_cb"/> - </layout_panel> - <layout_panel name="snapshot_panel"> - <combo_box name="resolution_combobox" tool_tip="Resolução da imagem"> - <combo_box.item label="Janela atual" name="CurrentWindow"/> - <combo_box.item label="640x480" name="640x480"/> - <combo_box.item label="800x600" name="800x600"/> - <combo_box.item label="1024x768" name="1024x768"/> - </combo_box> - <combo_box name="filters_combobox" tool_tip="Filtros de imagem"> - <combo_box.item label="Sem filtro" name="NoFilter"/> - </combo_box> - <button label="Atualizar" name="new_snapshot_btn" tool_tip="Clique para atualizar"/> - <button label="Visualizar" name="big_preview_btn" tool_tip="Clique para alternar entre visualizações"/> - </layout_panel> - <layout_panel name="photo_button_panel"> - <button label="Enviar tweet" name="post_photo_btn"/> - <button label="Cancelar" name="cancel_photo_btn"/> - </layout_panel> - </layout_stack> + <text name="status_label"> + Próximas etapas? + </text> + <text name="status_counter_label"> + 140 + </text> + <check_box initial_value="true" label="Incluir localização do SL" name="add_location_cb"/> + <check_box initial_value="true" label="Incluir uma foto" name="add_photo_cb"/> + <combo_box name="resolution_combobox" tool_tip="Resolução da imagem"> + <combo_box.item label="Janela atual" name="CurrentWindow"/> + <combo_box.item label="640x480" name="640x480"/> + <combo_box.item label="800x600" name="800x600"/> + <combo_box.item label="1024x768" name="1024x768"/> + </combo_box> + <combo_box name="filters_combobox" tool_tip="Filtros de imagem"> + <combo_box.item label="Sem filtro" name="NoFilter"/> + </combo_box> + <button label="Atualizar" name="new_snapshot_btn" tool_tip="Clique para atualizar"/> + <button label="Visualizar" name="big_preview_btn" tool_tip="Clique para alternar entre visualizações"/> + <button label="Enviar tweet" name="post_photo_btn"/> + <button label="Cancelar" name="cancel_photo_btn"/> </panel> |