diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-19 16:38:30 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-19 16:38:30 -0500 |
| commit | cf2876447708214fb12aa17af378fac5c9924034 (patch) | |
| tree | f59a63f4998f71174fafc6f763223d008e91a7fe /indra/newview/llappearancemgr.cpp | |
| parent | 120e64387cc8275de68aca990d186540f5468c89 (diff) | |
| parent | 061b04132ddf96dc55f962add8bf254bba54bd46 (diff) | |
pulling tags back from beta branch
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) |