diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index afdd99e..ca1e0a8 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -1388,11 +1388,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1388 | } | 1388 | } |
1389 | 1389 | ||
1390 | if (!Permissions.CanCopyObjectInventory(itemId, part.UUID, remoteClient.AgentId)) | 1390 | if (!Permissions.CanCopyObjectInventory(itemId, part.UUID, remoteClient.AgentId)) |
1391 | { | 1391 | return; |
1392 | // check also if we can delete the no copy item | ||
1393 | if(!Permissions.CanEditObject(part.UUID, remoteClient.AgentId)) | ||
1394 | return; | ||
1395 | } | ||
1396 | 1392 | ||
1397 | string message; | 1393 | string message; |
1398 | InventoryItemBase item = MoveTaskInventoryItem(remoteClient, folderId, part, itemId, out message); | 1394 | InventoryItemBase item = MoveTaskInventoryItem(remoteClient, folderId, part, itemId, out message); |
@@ -1769,7 +1765,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1769 | itemInfo.CurrentPermissions &= currentItem.BasePermissions; | 1765 | itemInfo.CurrentPermissions &= currentItem.BasePermissions; |
1770 | itemInfo.NextPermissions &= currentItem.BasePermissions; | 1766 | itemInfo.NextPermissions &= currentItem.BasePermissions; |
1771 | } | 1767 | } |
1772 | |||
1773 | } | 1768 | } |
1774 | else | 1769 | else |
1775 | { | 1770 | { |