diff options
author | mingchen | 2008-05-07 21:52:11 +0000 |
---|---|---|
committer | mingchen | 2008-05-07 21:52:11 +0000 |
commit | e364c6458354f41583e5130123588d731903ae06 (patch) | |
tree | b026755a52f95911ceb48f249bc863b34b994af6 | |
parent | * Doh! scripts that get controls should get controls even when you're sittin... (diff) | |
download | opensim-SC_OLD-e364c6458354f41583e5130123588d731903ae06.zip opensim-SC_OLD-e364c6458354f41583e5130123588d731903ae06.tar.gz opensim-SC_OLD-e364c6458354f41583e5130123588d731903ae06.tar.bz2 opensim-SC_OLD-e364c6458354f41583e5130123588d731903ae06.tar.xz |
*Fixed bug causing Object Duplication to not correctly follow permissions
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | 5 |
1 files changed, 4 insertions, 1 deletions
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 | |||
502 | public virtual bool CanCopyObject(LLUUID user, LLUUID obj) | 502 | public virtual bool CanCopyObject(LLUUID user, LLUUID obj) |
503 | { | 503 | { |
504 | bool permission = GenericObjectPermission(user, obj); | 504 | bool permission = GenericObjectPermission(user, obj); |
505 | if (!permission) | 505 | if (permission) |
506 | { | 506 | { |
507 | if (!m_scene.Entities.ContainsKey(obj)) | 507 | if (!m_scene.Entities.ContainsKey(obj)) |
508 | { | 508 | { |
@@ -520,6 +520,9 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
520 | // Added this because at this point in time it wouldn't be wise for | 520 | // Added this because at this point in time it wouldn't be wise for |
521 | // the administrator object permissions to take effect. | 521 | // the administrator object permissions to take effect. |
522 | LLUUID objectOwner = task.OwnerID; | 522 | LLUUID objectOwner = task.OwnerID; |
523 | |||
524 | //Check ExternalChecks! | ||
525 | if (m_scene.ExternalChecks.ExternalChecksCanRezObject(task.Children.Count, objectOwner, task.GroupCentrePoint) == false) return false; | ||
523 | if ((task.RootPart.EveryoneMask & PERM_COPY) != 0) | 526 | if ((task.RootPart.EveryoneMask & PERM_COPY) != 0) |
524 | permission = true; | 527 | permission = true; |
525 | } | 528 | } |