diff options
| author | Joshua Bell <josh@lindenlab.com> | 2011-01-13 12:16:54 -0800 |
|---|---|---|
| committer | Joshua Bell <josh@lindenlab.com> | 2011-01-13 12:16:54 -0800 |
| commit | dee9c80862ed54138889de8095087dda340ac073 (patch) | |
| tree | 4c947e89be49cf6cafafc95b9f1b6634c57339f2 /indra/newview/llappearancemgr.cpp | |
| parent | 20b983afe0d7f66a1db036c60e4c53b6141eb0cd (diff) | |
| parent | 756a4e26da6cec82d48a71d05b1f43623b56313d (diff) | |
merged
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 80734b0d41..f40fed5ad3 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) |