diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index bce7d324fe..18ec25f207 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2056,6 +2056,13 @@ namespace OpenSim.Region.Framework.Scenes
group.Children.Count, remoteClient.AgentId, pos)
&& !attachment)
{
+ // The client operates in no fail mode. It will
+ // have already removed the item from the folder
+ // if it's no copy.
+ // Put it back if it's not an attachment
+ //
+ if (((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!attachment))
+ remoteClient.SendBulkUpdateInventory(item);
return null;
}
diff --git a/OpenSim/Services/Interfaces/IInventoryService.cs b/OpenSim/Services/Interfaces/IInventoryService.cs
index c77509014a..1b78fb3912 100644
--- a/OpenSim/Services/Interfaces/IInventoryService.cs
+++ b/OpenSim/Services/Interfaces/IInventoryService.cs
@@ -59,6 +59,7 @@ namespace OpenSim.Services.Interfaces
///
///
///
+ [Obsolete]
InventoryCollection GetUserInventory(UUID userID);
///
@@ -67,6 +68,7 @@ namespace OpenSim.Services.Interfaces
///
///
///
+ [Obsolete]
void GetUserInventory(UUID userID, InventoryReceiptCallback callback);
///