diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-06-11 18:22:00 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-06-11 18:22:00 +0300 |
| commit | 47211f0ed5c9dab26c512e59b0d8f54e9018f548 (patch) | |
| tree | 01c0be37ad474da0dbc9029fc6e2886b9c9bf234 /indra | |
| parent | 680ef887a24dd8adb35514bcf10ca60671867fee (diff) | |
EXT-7716 FIXED Allowed removing an outfit containing links to worn wearables.
Removed a redundant check disallowing removal of an outfit containing links to worn items.
So now we use the same condition as in the inventory panel.
Note that if an outfit that you're trying to remove contains originals of currently worn items, we still disallow removal.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/559/
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -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()) |