From 05196ebe27f4d3827049704bf8ee1d93a28875a4 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 20 Jan 2017 22:50:50 +0000 Subject: test jenkins --- OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'OpenSim/Region/CoreModules') diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index 95a007a..2275497 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs @@ -1441,17 +1441,17 @@ namespace OpenSim.Region.CoreModules.World.Permissions { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); - if(sog == null || sog.IsDeleted) - return false; - float newX = newPoint.X; float newY = newPoint.Y; - // allow outside region this mb needed for crossings + // allow outside region this is needed for crossings if (newX < -1f || newX > (scene.RegionInfo.RegionSizeX + 1.0f) || newY < -1f || newY > (scene.RegionInfo.RegionSizeY + 1.0f) ) return true; + if(sog == null || sog.IsDeleted) + return false; + if (m_bypassPermissions) return m_bypassPermissionsValue; -- cgit v1.1