aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs10
1 files changed, 0 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 4fb4cc2..aa5d381 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -597,9 +597,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
597 597
598 if (remoteClient != null && (remoteClient.AgentId != so.RootPart.OwnerID) && m_Scene.Permissions.PropagatePermissions()) 598 if (remoteClient != null && (remoteClient.AgentId != so.RootPart.OwnerID) && m_Scene.Permissions.PropagatePermissions())
599 { 599 {
600 // Changing ownership, so apply the "Next Owner" permissions to all of the
601 // inventory item's permissions.
602
603 uint perms = effectivePerms; 600 uint perms = effectivePerms;
604 uint nextPerms = (perms & 7) << 13; 601 uint nextPerms = (perms & 7) << 13;
605 if ((nextPerms & (uint)PermissionMask.Copy) == 0) 602 if ((nextPerms & (uint)PermissionMask.Copy) == 0)
@@ -620,13 +617,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
620 } 617 }
621 else 618 else
622 { 619 {
623 // Not changing ownership.
624 // In this case we apply the permissions in the object's items ONLY to the inventory
625 // item's "Next Owner" permissions, but NOT to its "Current", "Base", etc. permissions.
626 // E.g., if the object contains a No-Transfer item then the item's "Next Owner"
627 // permissions are also No-Transfer.
628 PermissionsUtil.ApplyFoldedPermissions(effectivePerms, ref allObjectsNextOwnerPerms);
629
630 item.BasePermissions = effectivePerms; 620 item.BasePermissions = effectivePerms;
631 item.CurrentPermissions = effectivePerms; 621 item.CurrentPermissions = effectivePerms;
632 item.NextPermissions = so.RootPart.NextOwnerMask & effectivePerms; 622 item.NextPermissions = so.RootPart.NextOwnerMask & effectivePerms;