aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index db6ba94..dc2ce48 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -710,7 +710,7 @@ namespace OpenSim.Region.Framework.Scenes
710 else 710 else
711 { 711 {
712 // If item is transfer or permissions are off or calling agent is allowed to copy item owner's inventory item. 712 // If item is transfer or permissions are off or calling agent is allowed to copy item owner's inventory item.
713 if (((item.CurrentPermissions & (uint)PermissionMask.Transfer) != 0) || m_permissions.BypassPermissions() || m_permissions.CanCopyUserInventory(remoteClient.AgentId, oldItemID)) 713 if (((item.CurrentPermissions & (uint)PermissionMask.Transfer) != 0) && (m_permissions.BypassPermissions() || m_permissions.CanCopyUserInventory(remoteClient.AgentId, oldItemID)))
714 { 714 {
715 CreateNewInventoryItem( 715 CreateNewInventoryItem(
716 remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Flags, callbackID, 716 remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Flags, callbackID,