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

STORM-183 : Pull and merge in viewer-development

meow-7.2.2
Merov Linden 2010-09-16 10:35:58 -07:00
parent ab199473f7 4495dd26f8
commit 128bcffb62
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/lloutfitslist.cpp
View File

@ -85,7 +85,7 @@ public:
registrar.add("Gear.WearAdd", boost::bind(&LLOutfitListGearMenu::onAdd, this));
enable_registrar.add("Gear.OnEnable", boost::bind(&LLOutfitsList::isActionEnabled, mOutfitList, _2));
enable_registrar.add("Gear.OnEnable", boost::bind(&LLOutfitListGearMenu::onEnable, this, _2));
enable_registrar.add("Gear.OnVisible", boost::bind(&LLOutfitListGearMenu::onVisible, this, _2));
mMenu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>(
@ -209,6 +209,20 @@ private:
LLAgentWearables::createWearable(type, true);
}
bool onEnable(LLSD::String param)
{
// Handle the "Wear - Replace Current Outfit" menu option specially
// because LLOutfitList::isActionEnabled() checks whether it's allowed
// to wear selected outfit OR selected items, while we're only
// interested in the outfit (STORM-183).
if ("wear" == param)
{
return LLAppearanceMgr::instance().getCanReplaceCOF(mOutfitList->getSelectedOutfitUUID());
}
return mOutfitList->isActionEnabled(param);
}
bool onVisible(LLSD::String param)
{
const LLUUID& selected_outfit_id = getSelectedOutfitID();