From ad58f9b17e768dad4c569d3d9f5df7de0e3f66db Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 28 Sep 2015 17:55:35 +0100 Subject: recover a lost position check for mega regions --- OpenSim/Region/Framework/Scenes/Scene.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 932c9a1..cf084d6 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -2296,11 +2296,8 @@ namespace OpenSim.Region.Framework.Scenes } Vector3 pos = Vector3.Zero; - if (RayEndIsIntersection == (byte)1) - { - pos = RayEnd; - } - else + + if (RayEndIsIntersection != (byte)1) { Vector3 rayEnd = RayEnd; @@ -2831,7 +2828,11 @@ namespace OpenSim.Region.Framework.Scenes if (xx < RegionInfo.RegionSizeX && yy < RegionInfo.RegionSizeY ) ret = true; } - + else + { + // We're in a mega-region so see if we are still in that larger region + ret = regionCombinerModule.PositionIsInMegaregion(this.RegionInfo.RegionID, xx, yy); + } return ret; } -- cgit v1.1