diff options
author | Dessie Linden <dessie@lindenlab.com> | 2010-06-14 07:58:04 -0700 |
---|---|---|
committer | Dessie Linden <dessie@lindenlab.com> | 2010-06-14 07:58:04 -0700 |
commit | d1ecffeb8e4b02bc5d796872e61eebf84e598983 (patch) | |
tree | b995b4bd4c1cc4aaef25dbd1f63eb72cde7b748b /indra/newview/llappearancemgr.cpp | |
parent | d3418e5e65f7845f89b5ce2019bd635861573ed3 (diff) | |
parent | e96544ff266849207adfc3823adfc2dcfe42ce72 (diff) |
Merged from viewer-release
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
-rw-r--r-- | indra/newview/llappearancemgr.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 12d2752180..3691d731ed 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -965,18 +965,10 @@ bool LLAppearanceMgr::getCanRemoveOutfit(const LLUUID& outfit_cat_id) return false; } - // Check if the folder contains worn items. - LLInventoryModel::cat_array_t cats; - LLInventoryModel::item_array_t items; - LLFindWorn filter_worn; - gInventory.collectDescendentsIf(outfit_cat_id, cats, items, false, filter_worn); - if (!items.empty()) - { - return false; - } - // Check for the folder's non-removable descendants. LLFindNonRemovableObjects filter_non_removable; + LLInventoryModel::cat_array_t cats; + LLInventoryModel::item_array_t items; LLInventoryModel::item_array_t::const_iterator it; gInventory.collectDescendentsIf(outfit_cat_id, cats, items, false, filter_non_removable); if (!cats.empty() || !items.empty()) |