summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2010-06-23 20:53:30 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2010-06-23 20:53:30 -0400
commitceb226fffb3812d315a26ebcc1f5094fdc0b8b42 (patch)
treed866486f01fc6af8ba764897e8ced323da0cd722 /indra/newview/skins/default/xui
parentbe059c2111d1eb880a8b0e5565690ff528d30587 (diff)
parentbb083dfca471edde7d44f161be2aabca92e72d02 (diff)
Automated merge with ssh://hg.lindenlab.com/q/viewer-release/
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/panel_outfit_edit.xml18
1 files changed, 15 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index d6549adfef..4abd7dceac 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -391,12 +391,12 @@ It is calculated as border_size + 2*UIResizeBarOverlap
follows="bottom|right"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
- image_overlay="AddItem_Off"
+ image_overlay="Shop"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
layout="topleft"
left_pad="0"
- name="shop_btn"
+ name="shop_btn_1"
top="1"
width="31" />
</panel>
@@ -472,8 +472,20 @@ It is calculated as border_size + 2*UIResizeBarOverlap
layout="topleft"
left_pad="1"
name="dummy_right_icon"
- width="184" >
+ width="153" >
</icon>
+ <button
+ follows="bottom|right"
+ height="25"
+ image_hover_unselected="Toolbar_Middle_Over"
+ image_overlay="Shop"
+ image_selected="Toolbar_Middle_Selected"
+ image_unselected="Toolbar_Middle_Off"
+ layout="topleft"
+ left_pad="0"
+ name="shop_btn_2"
+ top="1"
+ width="31" />
</panel>
<!-- SAVE AND REVERT BUTTONS -->