diff options
author | Charles Krinke | 2008-10-06 00:58:43 +0000 |
---|---|---|
committer | Charles Krinke | 2008-10-06 00:58:43 +0000 |
commit | e575ef7ad2245aad17f57273f6bd7b774f99f057 (patch) | |
tree | a85fd727bac7f3d39259df3aaea6c93f3f32ba05 /OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | |
parent | Mantis#2336. Thank you kindly, Ralphos for a patch that: (diff) | |
download | opensim-SC_OLD-e575ef7ad2245aad17f57273f6bd7b774f99f057.zip opensim-SC_OLD-e575ef7ad2245aad17f57273f6bd7b774f99f057.tar.gz opensim-SC_OLD-e575ef7ad2245aad17f57273f6bd7b774f99f057.tar.bz2 opensim-SC_OLD-e575ef7ad2245aad17f57273f6bd7b774f99f057.tar.xz |
Revert r6697 patch as the build fails.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | 18 |
1 files changed, 7 insertions, 11 deletions
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 | |||
984 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 984 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
985 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 985 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
986 | 986 | ||
987 | bool permission = false; | ||
988 | |||
987 | // Estate override | 989 | // Estate override |
988 | if (GenericEstatePermission(user)) | 990 | if (GenericEstatePermission(user)) |
989 | return true; | 991 | permission = true; |
990 | 992 | ||
991 | float X = position.X; | 993 | float X = position.X; |
992 | float Y = position.Y; | 994 | float Y = position.Y; |
@@ -1000,19 +1002,13 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
1000 | if (Y < 0) | 1002 | if (Y < 0) |
1001 | Y = 0; | 1003 | Y = 0; |
1002 | 1004 | ||
1003 | ILandObject parcel = m_scene.LandChannel.GetLandObject(X, Y); | ||
1004 | if (parcel == null) | ||
1005 | return false; | ||
1006 | |||
1007 | // Others allowed to terraform? | ||
1008 | if ((parcel.landData.Flags & ((int)Parcel.ParcelFlags.AllowTerraform)) != 0) | ||
1009 | return true; | ||
1010 | |||
1011 | // Land owner can terraform too | 1005 | // Land owner can terraform too |
1006 | ILandObject parcel = m_scene.LandChannel.GetLandObject(X, Y); | ||
1012 | if (parcel != null && GenericParcelPermission(user, parcel)) | 1007 | if (parcel != null && GenericParcelPermission(user, parcel)) |
1013 | return true; | 1008 | permission = true; |
1014 | 1009 | ||
1015 | return false; | 1010 | |
1011 | return permission; | ||
1016 | } | 1012 | } |
1017 | 1013 | ||
1018 | private bool CanViewScript(UUID script, UUID objectID, UUID user, Scene scene) | 1014 | private bool CanViewScript(UUID script, UUID objectID, UUID user, Scene scene) |