diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-06-24 11:20:51 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-06-24 11:20:51 +0300 |
| commit | 82167627ee4999c1485fa5389011a48a07934cc8 (patch) | |
| tree | 599f460825368dd5f6930de7189d90c4d257d38f /indra/newview/skins/default/xui/en | |
| parent | 9aad53a4370b7647e4f907be7c3dc908906491b9 (diff) | |
| parent | 6fbfb03358f4f3077c698afa183d4f21682de93b (diff) | |
Merge with default branche.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_outfit_edit.xml | 18 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml | 2 |
2 files changed, 16 insertions, 4 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 --> diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml index 49c2abe1a5..50be0ac1a1 100644 --- a/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml @@ -15,5 +15,5 @@ <worn_style font="SansSerifSmall" font.style="BOLD" - color="green" /> + color="EmphasisColor" /> </inventory_list_item> |