aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorUbitUmarov2017-01-20 22:50:50 +0000
committerUbitUmarov2017-01-20 22:50:50 +0000
commit05196ebe27f4d3827049704bf8ee1d93a28875a4 (patch)
tree5bcfc13714594853a9411a16d1199a9a82c42328 /OpenSim/Region/CoreModules
parentchange CanObjectEntry() to use a SOG (diff)
downloadopensim-SC_OLD-05196ebe27f4d3827049704bf8ee1d93a28875a4.zip
opensim-SC_OLD-05196ebe27f4d3827049704bf8ee1d93a28875a4.tar.gz
opensim-SC_OLD-05196ebe27f4d3827049704bf8ee1d93a28875a4.tar.bz2
opensim-SC_OLD-05196ebe27f4d3827049704bf8ee1d93a28875a4.tar.xz
test jenkins
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs8
1 files changed, 4 insertions, 4 deletions
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
1441 { 1441 {
1442 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); 1442 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
1443 1443
1444 if(sog == null || sog.IsDeleted)
1445 return false;
1446
1447 float newX = newPoint.X; 1444 float newX = newPoint.X;
1448 float newY = newPoint.Y; 1445 float newY = newPoint.Y;
1449 1446
1450 // allow outside region this mb needed for crossings 1447 // allow outside region this is needed for crossings
1451 if (newX < -1f || newX > (scene.RegionInfo.RegionSizeX + 1.0f) || 1448 if (newX < -1f || newX > (scene.RegionInfo.RegionSizeX + 1.0f) ||
1452 newY < -1f || newY > (scene.RegionInfo.RegionSizeY + 1.0f) ) 1449 newY < -1f || newY > (scene.RegionInfo.RegionSizeY + 1.0f) )
1453 return true; 1450 return true;
1454 1451
1452 if(sog == null || sog.IsDeleted)
1453 return false;
1454
1455 if (m_bypassPermissions) 1455 if (m_bypassPermissions)
1456 return m_bypassPermissionsValue; 1456 return m_bypassPermissionsValue;
1457 1457