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

Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/ 

--HG--
branch : avatar-pipeline
meow-7.2.2
Nyx (Neal Orman) 2009-12-17 16:27:14 -05:00
parent 49cb11010e 9abe3c5814
commit bad019313a
2 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llpaneloutfitsinventory.cpp
View File

@ -240,7 +240,7 @@ void LLPanelOutfitsInventory::initListCommandsHandlers()
mListCommands->childSetAction("options_gear_btn", boost::bind(&LLPanelOutfitsInventory::onGearButtonClick, this));
mListCommands->childSetAction("trash_btn", boost::bind(&LLPanelOutfitsInventory::onTrashButtonClick, this));
mListCommands->childSetAction("add_btn", boost::bind(&LLPanelOutfitsInventory::onAddButtonClick, this));
mListCommands->childSetAction("make_outfit_btn", boost::bind(&LLPanelOutfitsInventory::onAddButtonClick, this));
mListCommands->childSetAction("wear_btn", boost::bind(&LLPanelOutfitsInventory::onWearButtonClick, this));
mListCommands->childSetAction("look_edit_btn", boost::bind(&LLPanelOutfitsInventory::onSelectorButtonClicked, this));
@ -477,6 +477,9 @@ void LLPanelOutfitsInventory::onTabChange()
return;
}
mActivePanel->setFilterSubString(mFilterSubString);
bool is_my_outfits = (mActivePanel->getName() == "outfitslist_accordionpanel");
mListCommands->childSetEnabled("make_outfit_btn", is_my_outfits);
}
LLInventoryPanel* LLPanelOutfitsInventory::getActivePanel()

55
indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
View File

@ -69,18 +69,7 @@
name="options_gear_btn"
top="6"
width="18" />
<button
follows="bottom|left"
height="18"
image_selected="AddItem_Press"
image_unselected="AddItem_Off"
image_disabled="AddItem_Disabled"
layout="topleft"
left_pad="5"
name="add_btn"
tool_tip="Add new item"
width="18" />
<dnd_button
<dnd_button
follows="bottom|left"
height="18"
image_selected="TrashItem_Press"
@ -92,22 +81,34 @@
top="6"
width="18" />
<button
follows="top|left"
height="23"
label="Wear"
follows="bottom|left"
height="23"
label="Edit Look"
layout="topleft"
name="wear_btn"
right="-5"
top_pad="0"
left="10"
name="look_edit_btn"
top="26"
visible="false"
width="90" />
<button
follows="bottom|left"
height="23"
label="edit look"
layout="topleft"
left_pad="-200"
name="look_edit_btn"
visible="false"
width="90" />
<button
follows="bottom|left"
height="23"
label="Make Outfit"
layout="topleft"
name="make_outfit_btn"
tool_tip="Save appearance as an outfit"
top="26"
right="-110"
width="90" />
<button
follows="bottom|right"
height="23"
label="Wear"
layout="topleft"
name="wear_btn"
right="-10"
top="26"
tool_tip="Wear selected outfit"
width="90" />
</panel>
</panel>