From e575ef7ad2245aad17f57273f6bd7b774f99f057 Mon Sep 17 00:00:00 2001 From: Charles Krinke Date: Mon, 6 Oct 2008 00:58:43 +0000 Subject: Revert r6697 patch as the build fails. --- .../Modules/World/Permissions/PermissionsModule.cs | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs') diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index abbf40e..16743ea 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs @@ -984,9 +984,11 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); if (m_bypassPermissions) return m_bypassPermissionsValue; + bool permission = false; + // Estate override if (GenericEstatePermission(user)) - return true; + permission = true; float X = position.X; float Y = position.Y; @@ -1000,19 +1002,13 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions if (Y < 0) Y = 0; - ILandObject parcel = m_scene.LandChannel.GetLandObject(X, Y); - if (parcel == null) - return false; - - // Others allowed to terraform? - if ((parcel.landData.Flags & ((int)Parcel.ParcelFlags.AllowTerraform)) != 0) - return true; - // Land owner can terraform too + ILandObject parcel = m_scene.LandChannel.GetLandObject(X, Y); if (parcel != null && GenericParcelPermission(user, parcel)) - return true; + permission = true; - return false; + + return permission; } private bool CanViewScript(UUID script, UUID objectID, UUID user, Scene scene) -- cgit v1.1