diff options
| author | prep linden <prep@lindenlab.com> | 2011-01-14 15:30:57 -0500 |
|---|---|---|
| committer | prep linden <prep@lindenlab.com> | 2011-01-14 15:30:57 -0500 |
| commit | eec6071766e6fef7015610b002a9bcb09ce36836 (patch) | |
| tree | 4f63bb1629b5295a1de10d1a014b5297a6cf34cc /indra/newview/llappearancemgr.cpp | |
| parent | a678ff80af6c48d4232c52aa505b633a1fc22663 (diff) | |
| parent | 645da31dd70834dd67a854b3775529154e538d7f (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) |