diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-13 18:54:16 +0300 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-13 18:54:16 +0300 |
commit | ba1123e3e482fdd061095c1374a41f8d007fbc22 (patch) | |
tree | 499b01923892a406d306eadd4507e6d7a41b471b /indra/newview/skins/default/xui/pt/panel_outfit_edit.xml | |
parent | 623dae525dc14a69322266e33421770431c34a66 (diff) | |
parent | c3099df719274556fede1a57bc42e555e5c89fbb (diff) |
Manual merge from default branch
Resolved conflicts in llpaneloutfitedit.cpp
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/pt/panel_outfit_edit.xml')
-rw-r--r-- | indra/newview/skins/default/xui/pt/panel_outfit_edit.xml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml b/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml index 74aec1cbd2..12c57411db 100644 --- a/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml @@ -34,8 +34,16 @@ </layout_panel> </layout_stack> </layout_panel> - <layout_panel name="add_wearables_panel"/> + <layout_panel name="add_wearables_panel"> + <button label="Vestir" name="plus_btn"/> + </layout_panel> </layout_stack> + <panel name="no_add_wearables_button_bar"> + <button name="shop_btn_1" tool_tip="Visite o SL Marketplace. Ou selecione algum artigo do seu look e clique aqui para ver outros artigos parecidos"/> + </panel> + <panel name="add_wearables_button_bar"> + <button name="shop_btn_2" tool_tip="Visite o SL Marketplace. Ou selecione algum artigo do seu look e clique aqui para ver outros artigos parecidos"/> + </panel> <panel name="save_revert_button_bar"> <button label="Salvar" name="save_btn"/> <button label="Desfazer mudanças" name="revert_btn" tool_tip="Voltar à versão salva anterior"/> |