aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorUbitUmarov2015-09-28 17:55:35 +0100
committerUbitUmarov2015-09-28 17:55:35 +0100
commitad58f9b17e768dad4c569d3d9f5df7de0e3f66db (patch)
tree1e570f964b9482794352a5314af0e7732db6afe2 /OpenSim/Region/Framework/Scenes
parent put back virtual declarations (diff)
downloadopensim-SC-ad58f9b17e768dad4c569d3d9f5df7de0e3f66db.zip
opensim-SC-ad58f9b17e768dad4c569d3d9f5df7de0e3f66db.tar.gz
opensim-SC-ad58f9b17e768dad4c569d3d9f5df7de0e3f66db.tar.bz2
opensim-SC-ad58f9b17e768dad4c569d3d9f5df7de0e3f66db.tar.xz
recover a lost position check for mega regions
Diffstat (limited to '')
-rwxr-xr-xOpenSim/Region/Framework/Scenes/Scene.cs13
1 files changed, 7 insertions, 6 deletions
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
2296 } 2296 }
2297 2297
2298 Vector3 pos = Vector3.Zero; 2298 Vector3 pos = Vector3.Zero;
2299 if (RayEndIsIntersection == (byte)1) 2299
2300 { 2300 if (RayEndIsIntersection != (byte)1)
2301 pos = RayEnd;
2302 }
2303 else
2304 { 2301 {
2305 Vector3 rayEnd = RayEnd; 2302 Vector3 rayEnd = RayEnd;
2306 2303
@@ -2831,7 +2828,11 @@ namespace OpenSim.Region.Framework.Scenes
2831 if (xx < RegionInfo.RegionSizeX && yy < RegionInfo.RegionSizeY ) 2828 if (xx < RegionInfo.RegionSizeX && yy < RegionInfo.RegionSizeY )
2832 ret = true; 2829 ret = true;
2833 } 2830 }
2834 2831 else
2832 {
2833 // We're in a mega-region so see if we are still in that larger region
2834 ret = regionCombinerModule.PositionIsInMegaregion(this.RegionInfo.RegionID, xx, yy);
2835 }
2835 return ret; 2836 return ret;
2836 } 2837 }
2837 2838