EXP-1863 : Implemented cut, copy, paste for folders. Issues with folder filtering though.

1 files changed, 42 insertions, 3 deletions

diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index 9d12478019..808b7619eb 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -240,12 +240,26 @@ BOOL LLInventoryFilter::checkAgainstFilterType(const LLFolderViewItem* item) con
 
 	////////////////////////////////////////////////////////////////////////////////
 	// FILTERTYPE_CLIPBOARD
-	// Pass if this item is not on the clipboard
+	// Pass if this item is not on the clipboard or is not a descendant of a folder 
+	// which is on the clipboard
 	if (filterTypes & FILTERTYPE_CLIPBOARD)
 	{
-		if (LLClipboard::getInstance()->isCutMode() && LLClipboard::getInstance()->isOnClipboard(object_id))
+		if (LLClipboard::getInstance()->isCutMode())
 		{
-			return FALSE;
+			LLUUID current_id = object_id;
+			LLInventoryObject *current_object = gInventory.getObject(object_id);
+			while (current_id.notNull())
+			{
+				if (LLClipboard::getInstance()->isOnClipboard(current_id))
+				{
+					return FALSE;
+				}
+				current_id = current_object->getParentUUID();
+				if (current_id.notNull())
+				{
+					current_object = gInventory.getObject(current_id);
+				}
+			}
 		}
 	}
 		
@@ -309,6 +323,31 @@ bool LLInventoryFilter::checkAgainstFilterType(const LLInventoryItem* item) cons
 			return false;
 	}
 
+	////////////////////////////////////////////////////////////////////////////////
+	// FILTERTYPE_CLIPBOARD
+	// Pass if this item is not on the clipboard or is not a descendant of a folder 
+	// which is on the clipboard
+	if (filterTypes & FILTERTYPE_CLIPBOARD)
+	{
+		if (LLClipboard::getInstance()->isCutMode())
+		{
+			LLUUID current_id = object_id;
+			LLInventoryObject *current_object = gInventory.getObject(object_id);
+			while (current_id.notNull())
+			{
+				if (LLClipboard::getInstance()->isOnClipboard(current_id))
+				{
+					return false;
+				}
+				current_id = current_object->getParentUUID();
+				if (current_id.notNull())
+				{
+					current_object = gInventory.getObject(current_id);
+				}
+			}
+		}
+	}
+
 	return true;
 }