summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/pt
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-07-08 12:56:00 -0400
committerOz Linden <oz@lindenlab.com>2011-07-08 12:56:00 -0400
commit553e5001e997890ce4374bf97968e760edcbfbfb (patch)
tree9323a7e9b098e6bbb8940d28c0fcfff2f8f7ded2 /indra/newview/skins/default/xui/pt
parentccb3ad90001c2b19cbd690d67317651ee0182f42 (diff)
parentd23e568c118d412b0e231f5bc75dede2d7c4aa06 (diff)
merge changes for storm-1462
Diffstat (limited to 'indra/newview/skins/default/xui/pt')
-rw-r--r--indra/newview/skins/default/xui/pt/panel_edit_pick.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_pick.xml b/indra/newview/skins/default/xui/pt/panel_edit_pick.xml
index 432affcf09..5eb9987e71 100644
--- a/indra/newview/skins/default/xui/pt/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_pick.xml
@@ -29,7 +29,7 @@
<layout_panel name="layout_panel1">
<button label="Salvar destaque" name="save_changes_btn"/>
</layout_panel>
- <layout_panel name="layout_panel1">
+ <layout_panel name="layout_panel2">
<button label="Cancelar" name="cancel_btn"/>
</layout_panel>
</layout_stack>