livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-7958 FIX fixed shop button in the appearance sidepanel 

updated icon, and fixed XUI so it displays properly.

Code reviewed by Monroe
master
Nyx (Neal Orman) 2010-06-23 20:53:24 -04:00
parent 8d301676c2
commit bb083dfca4
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llpaneloutfitedit.cpp
View File

@ -328,7 +328,8 @@ BOOL LLPanelOutfitEdit::postBuild()
childSetCommitCallback("list_view_btn", boost::bind(&LLPanelOutfitEdit::showWearablesListView, this), NULL);
childSetCommitCallback("wearables_gear_menu_btn", boost::bind(&LLPanelOutfitEdit::onGearButtonClick, this, _1), NULL);
childSetCommitCallback("gear_menu_btn", boost::bind(&LLPanelOutfitEdit::onGearButtonClick, this, _1), NULL);
childSetCommitCallback("shop_btn", boost::bind(&LLPanelOutfitEdit::onShopButtonClicked, this), NULL);
childSetCommitCallback("shop_btn_1", boost::bind(&LLPanelOutfitEdit::onShopButtonClicked, this), NULL);
childSetCommitCallback("shop_btn_2", boost::bind(&LLPanelOutfitEdit::onShopButtonClicked, this), NULL);
mCOFWearables = getChild<LLCOFWearables>("cof_wearables_list");
mCOFWearables->setCommitCallback(boost::bind(&LLPanelOutfitEdit::filterWearablesBySelectedItem, this));

BIN
indra/newview/skins/default/textures/icons/Shop.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 647 B

After

Width:  |  Height:  |  Size: 3.0 KiB

18
indra/newview/skins/default/xui/en/panel_outfit_edit.xml
View File

@ -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 -->