diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-28 17:05:11 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-28 17:05:11 -0500 |
| commit | b4b3f78c455a614d7738c29cdc6383e857d6028d (patch) | |
| tree | 84e35e9c1b2a05743b6236e9a7bfd14316169d13 /indra/newview/llappearancemgr.cpp | |
| parent | a9d023a4618e4e425d5d51e750374deebeff3bc0 (diff) | |
| parent | ee2678be57668844221a462ed1e215c3c7cbd841 (diff) | |
pull back fixes from beta
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) |