From 2207a7c6b11f7095b9705eaf59d1fb1a3a47c9e6 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Fri, 13 Nov 2015 20:24:18 -0500 Subject: [PATCH] Feature restore request: Allow removing from outfit from any folder height. --- indra/newview/llappearancemgr.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 3fb7073cf..e2b5185e8 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -1855,7 +1855,12 @@ bool LLAppearanceMgr::getCanRemoveFromCOF(const LLUUID& outfit_cat_id) } LLFindWearablesEx is_worn(/*is_worn=*/ true, /*include_body_parts=*/ false); - return gInventory.hasMatchingDirectDescendent(outfit_cat_id, is_worn, true); + // Singu Note: Diverge from LL here in order to dive into subfolder. + //return gInventory.hasMatchingDirectDescendent(outfit_cat_id, is_worn, true); + LLInventoryModel::item_array_t items; + LLInventoryModel::cat_array_t cats; + gInventory.collectDescendentsIf(outfit_cat_id, cats, items, LLInventoryModel::EXCLUDE_TRASH, is_worn, /*follow_folder_links=*/ true); + return items.size(); } // static