diff options
| author | leyla_linden <none@none> | 2011-01-19 11:39:25 -0800 |
|---|---|---|
| committer | leyla_linden <none@none> | 2011-01-19 11:39:25 -0800 |
| commit | 17068766b75fbe7dac968705f4f383fb61f73eb4 (patch) | |
| tree | 9a6923653b721311b61edac947b2e7682972cce3 /indra/newview/llappearancemgr.cpp | |
| parent | ca1c1eea78ff2ab83979a4308dd5a93ea0032fc8 (diff) | |
| parent | eec6071766e6fef7015610b002a9bcb09ce36836 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 0e080e713b..c45be8b05e 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -1300,8 +1300,16 @@ bool LLAppearanceMgr::getCanReplaceCOF(const LLUUID& outfit_cat_id) return false; } - // Check whether the outfit contains the full set of body parts (shape+skin+hair+eyes). - return getCanMakeFolderIntoOutfit(outfit_cat_id); + // 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); + return items.size() > 0; } void LLAppearanceMgr::purgeBaseOutfitLink(const LLUUID& category) |