ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

recover a lost position check for mega regions

Browse Source
This commit is contained in:
UbitUmarov
2015-09-28 17:55:35 +01:00
parent e0de76aa14
commit ad58f9b17e
1 changed files with 7 additions and 6 deletions
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;
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;
}