aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs14
1 files changed, 10 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 47c574a..ee51e80 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -692,10 +692,16 @@ namespace OpenSim.Region.Framework.Scenes
692 item.BasePermissions, item.CurrentPermissions, item.EveryOnePermissions, item.NextPermissions, item.GroupPermissions, Util.UnixTimeSinceEpoch()); 692 item.BasePermissions, item.CurrentPermissions, item.EveryOnePermissions, item.NextPermissions, item.GroupPermissions, Util.UnixTimeSinceEpoch());
693 } 693 }
694 else 694 else
695 { 695 {
696 CreateNewInventoryItem( 696 // If item is transfer or permissions are off or calling agent is allowed to copy item owner's inventory item.
697 remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Flags, callbackID, asset, (sbyte)item.InvType, 697 if (((item.CurrentPermissions & (uint)PermissionMask.Transfer) != 0) || m_permissions.BypassPermissions() || m_permissions.CanCopyUserInventory(remoteClient.AgentId, oldItemID))
698 item.NextPermissions, item.NextPermissions, item.EveryOnePermissions & item.NextPermissions, item.NextPermissions, item.GroupPermissions, Util.UnixTimeSinceEpoch()); 698 {
699 CreateNewInventoryItem(
700 remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Flags, callbackID,
701 asset, (sbyte) item.InvType,
702 item.NextPermissions, item.NextPermissions, item.EveryOnePermissions & item.NextPermissions,
703 item.NextPermissions, item.GroupPermissions, Util.UnixTimeSinceEpoch());
704 }
699 } 705 }
700 } 706 }
701 else 707 else