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

FIRE-15516 / BUG-8431: Allow removing from outfits for folder hierarchy

Ansariel 2015-02-09 20:10:14 +01:00
parent 152a26c702
commit 024c6b4749
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llappearancemgr.cpp
View File

@ -1794,7 +1794,17 @@ bool LLAppearanceMgr::getCanRemoveFromCOF(const LLUUID& outfit_cat_id)
}
LLFindWearablesEx is_worn(/*is_worn=*/ true, /*include_body_parts=*/ false);
return gInventory.hasMatchingDirectDescendent(outfit_cat_id, is_worn);
// <FS:Ansariel> FIRE-15516 / BUG-8431: Allow removing from outfits for folder hierarchy
//return gInventory.hasMatchingDirectDescendent(outfit_cat_id, is_worn);
LLInventoryModel::cat_array_t cats;
LLInventoryModel::item_array_t items;
gInventory.collectDescendentsIf(outfit_cat_id,
cats,
items,
LLInventoryModel::EXCLUDE_TRASH,
is_worn);
return items.size() > 0;
// </FS:Ansariel>
}
// static