From 2a71df1285076260f9fa0d04fc66f7ce4018b5f3 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Wed, 9 Jun 2010 12:22:25 -0700 Subject: [PATCH] Reverting that last permissions check upon drop. Looks like all dropped attachments are deleted from inventory. --- .../Avatar/Attachments/AttachmentsModule.cs | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 46d040f7ec..d1792d7945 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs @@ -375,16 +375,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments } part.ParentGroup.DetachToGround(); - // If the item is no-copy we need to delete it from inventory - InventoryItemBase item = m_scene.InventoryService.GetItem(new InventoryItemBase(itemID)); - if (item != null && (item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) - { - List uuids = new List(); - uuids.Add(inventoryID); - m_scene.InventoryService.DeleteItems(remoteClient.AgentId, uuids); - remoteClient.SendRemoveInventoryItem(inventoryID); - } - } + List uuids = new List(); + uuids.Add(inventoryID); + m_scene.InventoryService.DeleteItems(remoteClient.AgentId, uuids); + remoteClient.SendRemoveInventoryItem(inventoryID); + } m_scene.EventManager.TriggerOnAttach(part.ParentGroup.LocalId, itemID, UUID.Zero); }