From 30cd36ff98e9f695ec2aa3e7bf3a558dc19897db Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 18 Dec 2016 03:56:53 +0000 Subject: leave stupid broken permissions alone --- OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 000944f..61ea8ac 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs @@ -431,11 +431,9 @@ namespace OpenSim.Region.Framework.Scenes bool denyExportChange = false; // m_log.DebugFormat("[XXX]: B: {0} O: {1} E: {2}", itemUpd.BasePermissions, itemUpd.CurrentPermissions, itemUpd.EveryOnePermissions); - const uint permALLandExport = (uint)(PermissionMask.All | PermissionMask.Export); + // If the user is not the creator or doesn't have "E" in both "B" and "O", deny setting export - if (item.CreatorIdAsUuid != item.Owner && - ((item.BasePermissions & permALLandExport) != permALLandExport || - (item.CurrentPermissions & (uint)PermissionMask.Export) == 0)) + if ((item.BasePermissions & (uint)(PermissionMask.All | PermissionMask.Export)) != (uint)(PermissionMask.All | PermissionMask.Export) || (item.CurrentPermissions & (uint)PermissionMask.Export) == 0 || item.CreatorIdAsUuid != item.Owner) denyExportChange = true; // m_log.DebugFormat("[XXX]: Deny Export Update {0}", denyExportChange); -- cgit v1.1