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

- internal : RlvForceWear::forceFolder() should check that a wearable can actually be worn before adding it to the wear queue 

-> lack of the above check doesn't actually cause issues since LLAppearanceMgr::updateCOF() will still block the wear attempt but it's better with it in place

--HG--
branch : RLVa
meow-7.2.2
Kitty Barnett 2010-10-09 00:20:35 +02:00
parent 77a35d59ea
commit c851748c41
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/rlvhelper.cpp
View File

@ -360,9 +360,14 @@ void RlvForceWear::forceFolder(const LLViewerInventoryCategory* pFolder, EWearAc
case LLAssetType::AT_CLOTHING:
if (isWearAction(eAction))
{
// The check for whether we're replacing a currently worn composite item happens in onWearableArrived()
if (!isAddWearable(pItem))
addWearable(pRlvItem, f.getWearAction(pRlvItem->getParentUUID()));
ERlvWearMask eWearMask = gRlvWearableLocks.canWear(pRlvItem);
if ( ((ACTION_WEAR_REPLACE == eCurAction) && (eWearMask & RLV_WEAR_REPLACE)) ||
((ACTION_WEAR_ADD == eCurAction) && (eWearMask & RLV_WEAR_ADD)) )
{
// The check for whether we're replacing a currently worn composite item happens in onWearableArrived()
if (!isAddWearable(pItem))
addWearable(pRlvItem, eCurAction);
}
}
else
{