From e364c6458354f41583e5130123588d731903ae06 Mon Sep 17 00:00:00 2001 From: mingchen Date: Wed, 7 May 2008 21:52:11 +0000 Subject: *Fixed bug causing Object Duplication to not correctly follow permissions --- .../Environment/Modules/World/Permissions/PermissionsModule.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index 87c0027..7bd1bb3 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs @@ -502,7 +502,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions public virtual bool CanCopyObject(LLUUID user, LLUUID obj) { bool permission = GenericObjectPermission(user, obj); - if (!permission) + if (permission) { if (!m_scene.Entities.ContainsKey(obj)) { @@ -520,6 +520,9 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions // Added this because at this point in time it wouldn't be wise for // the administrator object permissions to take effect. LLUUID objectOwner = task.OwnerID; + + //Check ExternalChecks! + if (m_scene.ExternalChecks.ExternalChecksCanRezObject(task.Children.Count, objectOwner, task.GroupCentrePoint) == false) return false; if ((task.RootPart.EveryoneMask & PERM_COPY) != 0) permission = true; } -- cgit v1.1