SL-20575 Fix some deletion issues

- Fixes 'cut' checks for gallery
- Checking if large folder is deletable should be faster now
- For large flat root folders eliminated delay of looking for cof

Might be a good idea to start cashing isItemRemovable if category
version hasn't changed.

1 files changed, 6 insertions, 36 deletions

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index a12c4f7f76..4fb60b4c55 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2399,49 +2399,19 @@ void LLFolderBridge::update()
 	}
 }
 
-
-// Iterate through a folder's children to determine if
-// all the children are removable.
-class LLIsItemRemovable : public LLFolderViewFunctor
-{
-public:
-	LLIsItemRemovable(bool check_worn = true) : mPassed(TRUE), mCheckWorn(check_worn) {}
-	virtual void doFolder(LLFolderViewFolder* folder)
-	{
-		mPassed &= folder->getViewModelItem()->isItemRemovable(mCheckWorn);
-	}
-	virtual void doItem(LLFolderViewItem* item)
-	{
-		mPassed &= item->getViewModelItem()->isItemRemovable(mCheckWorn);
-	}
-	BOOL mPassed;
-    bool mCheckWorn;
-};
-
 // Can be destroyed (or moved to trash)
 BOOL LLFolderBridge::isItemRemovable(bool check_worn) const
 {
-	if (!get_is_category_removable(getInventoryModel(), mUUID))
+	if (!get_is_category_and_children_removable(getInventoryModel(), mUUID, check_worn))
 	{
 		return FALSE;
 	}
 
-	LLInventoryPanel* panel = mInventoryPanel.get();
-	LLFolderViewFolder* folderp = dynamic_cast<LLFolderViewFolder*>(panel ?   panel->getItemByID(mUUID) : NULL);
-	if (folderp)
-	{
-		LLIsItemRemovable folder_test(check_worn);
-		folderp->applyFunctorToChildren(folder_test);
-		if (!folder_test.mPassed)
-		{
-			return FALSE;
-		}
-	}
-
-	if (isMarketplaceListingsFolder() && (!LLMarketplaceData::instance().isSLMDataFetched() || LLMarketplaceData::instance().getActivationState(mUUID)))
-	{
-		return FALSE;
-	}
+    if (isMarketplaceListingsFolder()
+        && (!LLMarketplaceData::instance().isSLMDataFetched() || LLMarketplaceData::instance().getActivationState(mUUID)))
+    {
+        return FALSE;
+    }
 
 	return TRUE;
 }