From bb6ace0672fa5e1c47c534ba74396ef04daa408b Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 17 Feb 2012 14:42:12 -0800
Subject: EXP-1902, EXP-1903 : Move items cut to the trash when clipboard
 reset.

---
 indra/newview/llfolderview.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'indra/newview/llfolderview.cpp')

diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 0abfa9db8e..52cc70aee7 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -1014,6 +1014,7 @@ bool isDescendantOfASelectedItem(LLFolderViewItem* item, const std::vector<LLFol
 	return false;
 }
 
+// static
 void LLFolderView::removeCutItems()
 {
 	// There's no item in "cut" mode on the clipboard -> exit
@@ -2139,10 +2140,6 @@ bool LLFolderView::doToSelected(LLInventoryModel* model, const LLSD& userdata)
 	}
 	if (("copy" == action) || ("cut" == action))
 	{
-		// If there are things on the clipboard that have not been pasted but 
-		// already disappeared from view, we need to move them to the trash
-		removeCutItems();
-		
 		// Clear the clipboard before we start adding things on it
 		LLClipboard::getInstance()->reset();
 	}
-- 
cgit v1.2.3