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

merge from PE's viewer-release

meow-7.2.2
Tofu Linden 2010-07-06 11:36:06 +01:00
parent a1bbba2be6 1be44136e0
commit dc6c35e353
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llpaneloutfitsinventory.cpp
View File

@ -282,10 +282,17 @@ void LLPanelOutfitsInventory::showGearMenu()
void LLPanelOutfitsInventory::onTrashButtonClick()
{
mMyOutfitsPanel->removeSelected();
LLNotificationsUtil::add("DeleteOutfits", LLSD(), LLSD(), boost::bind(&LLPanelOutfitsInventory::onOutfitsRemovalConfirmation, this, _1, _2));
}
updateListCommands();
updateVerbs();
void LLPanelOutfitsInventory::onOutfitsRemovalConfirmation(const LLSD& notification, const LLSD& response)
{
S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
if (option != 0) return; // canceled
mMyOutfitsPanel->removeSelected();
updateListCommands();
updateVerbs();
}
bool LLPanelOutfitsInventory::isActionEnabled(const LLSD& userdata)

1
indra/newview/llpaneloutfitsinventory.h
View File

@ -94,6 +94,7 @@ protected:
void onWearButtonClick();
void showGearMenu();
void onTrashButtonClick();
void onOutfitsRemovalConfirmation(const LLSD& notification, const LLSD& response);
bool isActionEnabled(const LLSD& userdata);
void setWearablesLoading(bool val);
void onWearablesLoaded();

11
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -815,6 +815,17 @@ Delete pick <nolink>[PICK]</nolink>?
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="DeleteOutfits"
type="alertmodal">
Delete the selected outfit/s?
<usetemplate
name="okcancelbuttons"
notext="Cancel"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="PromptGoToEventsPage"