From 5ec39de2d9733b92d5ba79349e407702c5786dfd Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 12 May 2013 01:40:08 +1000
Subject: Fix Inventory "Cut" and "Paste" deletes inventory item instead of
 moving it, http://redmine.kokuaviewer.org/issues/961

Instead of copying something, then trying to delete the original,
which was happening before the copy hit the sim server,
just move it to a different folder like drag and drop does.
---
 linden/indra/newview/llinventorybridge.cpp         | 23 +++++-----------------
 .../skins/default/xui/en-us/menu_inventory.xml     |  2 --
 2 files changed, 5 insertions(+), 20 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index df32eab..c67c3c2 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -1921,24 +1921,11 @@ void LLFolderBridge::pasteFromClipboard()
 			item = model->getItem(objects.get(i));
 			if (item)
 			{
-				copy_inventory_item(
-					gAgent.getID(),
-					item->getPermissions().getOwner(),
-					item->getUUID(),
-					parent_id,
-					std::string(),
-					LLPointer<LLInventoryCallback>(NULL));
-				LLInventoryCategory* cat = model->getCategory(item->getUUID());
-				if(cat)
-				{
-					model->purgeDescendentsOf(mUUID);
-				}
-				LLInventoryObject* obj = model->getObject(item->getUUID());
-				if(!obj) return;
-				obj->removeFromServer();
-				LLPreview::hide(item->getUUID());
-				model->deleteObject(item->getUUID());
-				model->notifyObservers();
+				LLInvFVBridge::changeItemParent(
+					model,
+					(LLViewerInventoryItem*)item,
+					mUUID,
+					FALSE);
 			}
 		}
 	}
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
index 51e966c..8295d3a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
@@ -166,10 +166,8 @@
 		<on_click filter="" function="Inventory.DoToSelected" userdata="copy_uuid" />
 	</menu_item_call>
 	<menu_item_separator name="Copy Separator" />
-<!-- See IMP-961 http://redmine.kokuaviewer.org/issues/961
 	<menu_item_call bottom_delta="-18" height="18" label="Cut" left="0" mouse_opaque="true"
 	     name="Cut" width="128">
--->
 	    <on_click filter="" function="Inventory.DoToSelected" userdata="cut" />
 	</menu_item_call>
 	<menu_item_call bottom_delta="-18" height="18" label="Copy" left="0" mouse_opaque="true"
-- 
cgit v1.1