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

FIRE-11920: Always enable replace outfit from inventory

Kadah_Coba 2016-07-21 23:32:38 -07:00
parent 9b152a4bd9
commit 68e034f72b
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/llappearancemgr.cpp
View File

@ -1982,17 +1982,20 @@ bool LLAppearanceMgr::getCanReplaceCOF(const LLUUID& outfit_cat_id)
return false;
}
// <FS:KC> FIRE-11920: Always allow replacing outfit
// Check whether the outfit contains any wearables we aren't wearing already (STORM-702).
LLInventoryModel::cat_array_t cats;
LLInventoryModel::item_array_t items;
LLFindWearablesEx is_worn(/*is_worn=*/ false, /*include_body_parts=*/ true);
gInventory.collectDescendentsIf(outfit_cat_id,
cats,
items,
LLInventoryModel::EXCLUDE_TRASH,
is_worn);
// LLInventoryModel::cat_array_t cats;
// LLInventoryModel::item_array_t items;
// LLFindWearablesEx is_worn(/*is_worn=*/ false, /*include_body_parts=*/ true);
// gInventory.collectDescendentsIf(outfit_cat_id,
// cats,
// items,
// LLInventoryModel::EXCLUDE_TRASH,
// is_worn);
return items.size() > 0;
// return items.size() > 0;
return TRUE;
// </FS:KC> FIRE-11920: Always allow replacing outfit
}
// Moved from LLWearableList::ContextMenu for wider utility.