From 31dc5aa7287596cfa89112475bcb120f00cde228 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 6 Jan 2012 13:15:04 +0100
Subject: If dragging a script that is no copy from prim inventory into agent
 inventory, stop it first in scene. If deleting from prims, move to trash
 rather then making it poof.

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 29 ++++++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 1746cfe..e005698 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -996,13 +996,24 @@ namespace OpenSim.Region.Framework.Scenes
                 if (item == null)
                     return;
 
-                if (item.Type == 10)
+                InventoryFolderBase destFolder = InventoryService.GetFolderForType(remoteClient.AgentId, AssetType.TrashFolder);
+
+                // Move the item to trash. If this is a copiable item, only
+                // a copy will be moved and we will still need to delete
+                // the item from the prim. If it was no copy, is will be
+                // deleted by this method.
+                MoveTaskInventoryItem(remoteClient, destFolder.ID, part, itemID);
+
+                if (group.GetInventoryItem(localID, itemID) != null)
                 {
-                    part.RemoveScriptEvents(itemID);
-                    EventManager.TriggerRemoveScript(localID, itemID);
-                }
+                    if (item.Type == 10)
+                    {
+                        part.RemoveScriptEvents(itemID);
+                        EventManager.TriggerRemoveScript(localID, itemID);
+                    }
 
-                group.RemoveInventoryItem(localID, itemID);
+                    group.RemoveInventoryItem(localID, itemID);
+                }
                 part.SendPropertiesToClient(remoteClient);
             }
         }
@@ -1065,7 +1076,15 @@ namespace OpenSim.Region.Framework.Scenes
             if (!Permissions.BypassPermissions())
             {
                 if ((taskItem.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
+                {
+                    if (taskItem.Type == 10)
+                    {
+                        part.RemoveScriptEvents(itemId);
+                        EventManager.TriggerRemoveScript(part.LocalId, itemId);
+                    }
+
                     part.Inventory.RemoveInventoryItem(itemId);
+                }
             }
 
             return agentItem;
-- 
cgit v1.1