diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-17 18:53:01 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-17 18:53:01 -0500 |
| commit | 6b065789c0f38256adb046a0231fe22d05d038da (patch) | |
| tree | 5c672f3242e21ac94c7ba65e531352612660c43e | |
| parent | 03c75c22f9ef1a9f99e6151e566e18bae35f6927 (diff) | |
| parent | bad019313a71f2016d7f9a1cb08677578c71d4a1 (diff) | |
automated merge avp->avp
--HG--
branch : avatar-pipeline
| -rw-r--r-- | indra/newview/llpaneloutfitsinventory.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_outfits_inventory.xml | 55 |
2 files changed, 32 insertions, 28 deletions
diff --git a/indra/newview/llpaneloutfitsinventory.cpp b/indra/newview/llpaneloutfitsinventory.cpp index 59cd01f920..f9777147b7 100644 --- a/indra/newview/llpaneloutfitsinventory.cpp +++ b/indra/newview/llpaneloutfitsinventory.cpp @@ -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() diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml index 2f176f011b..5c99022f35 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -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> |