OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

recover a lost position check for mega regions

avinationmerge
UbitUmarov 2015-09-28 17:55:35 +01:00
parent e0de76aa14
commit ad58f9b17e
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -2296,11 +2296,8 @@ namespace OpenSim.Region.Framework.Scenes
} }
Vector3 pos = Vector3.Zero; Vector3 pos = Vector3.Zero;
if (RayEndIsIntersection == (byte)1)
{ if (RayEndIsIntersection != (byte)1)
pos = RayEnd;
}
else
{ {
Vector3 rayEnd = RayEnd; Vector3 rayEnd = RayEnd;
@ -2831,7 +2828,11 @@ namespace OpenSim.Region.Framework.Scenes
if (xx < RegionInfo.RegionSizeX && yy < RegionInfo.RegionSizeY ) if (xx < RegionInfo.RegionSizeX && yy < RegionInfo.RegionSizeY )
ret = true; 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; return ret;
} }