From 6b5a110857fcc1ef7a150a51408852226bbf0eb0 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Mon, 27 Apr 2009 23:12:35 +0000 Subject: Make sure that, on "Anyone can copy" the person copying the object has transfer perms as well as copy perms. This may block some cases where the owner would normally be able to take copy. Fixes Mantis #3464 --- OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index 25bfd7d..b8efc4a 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs @@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions private uint PERM_COPY = (uint)32768; //private uint PERM_MODIFY = (uint)16384; private uint PERM_MOVE = (uint)524288; - //private uint PERM_TRANS = (uint)8192; + private uint PERM_TRANS = (uint)8192; private uint PERM_LOCKED = (uint)540672; /// @@ -1132,14 +1132,14 @@ namespace OpenSim.Region.CoreModules.World.Permissions if ((task.RootPart.EveryoneMask & PERM_COPY) != 0) permission = true; - if ((task.GetEffectivePermissions() & PERM_COPY) == 0) + if ((task.GetEffectivePermissions() & (PERM_COPY | PERM_TRANS)) != (PERM_COPY | PERM_TRANS)) permission = false; } else { SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID]; - if ((task.GetEffectivePermissions() & PERM_COPY) == 0) + if ((task.GetEffectivePermissions() & (PERM_COPY | PERM_TRANS)) != (PERM_COPY | PERM_TRANS)) permission = false; } -- cgit v1.1