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

add more temporary fixes for regionSize zero

avinationmerge
UbitUmarov 2014-10-24 18:44:08 +01:00
parent d2b049b7ad
commit 21242205d1
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@ -1518,6 +1518,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
*/ */
float regionSizeX = regInfo.RegionSizeX; float regionSizeX = regInfo.RegionSizeX;
float regionSizeY = regInfo.RegionSizeY; float regionSizeY = regInfo.RegionSizeY;
if (regionSizeX == 0)
regionSizeX = 256f;
if (regionSizeY == 0)
regionSizeY = 256f;
if (pos.X < boundaryDistance) if (pos.X < boundaryDistance)
neighbourx--; neighbourx--;
@ -2446,6 +2450,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
int neighboury = (int)srcRegionInfo.RegionLocY; int neighboury = (int)srcRegionInfo.RegionLocY;
float regionSizeX = srcRegionInfo.RegionSizeX; float regionSizeX = srcRegionInfo.RegionSizeX;
float regionSizeY = srcRegionInfo.RegionSizeY; float regionSizeY = srcRegionInfo.RegionSizeY;
if (regionSizeX == 0)
regionSizeX = 256f;
if (regionSizeY == 0)
regionSizeY = 256f;
float edgeJitter = 0.2f; float edgeJitter = 0.2f;
@ -2470,6 +2478,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
float newRegionSizeX = neighbourRegion.RegionSizeX; float newRegionSizeX = neighbourRegion.RegionSizeX;
float newRegionSizeY = neighbourRegion.RegionSizeY; float newRegionSizeY = neighbourRegion.RegionSizeY;
if (newRegionSizeX == 0)
newRegionSizeX = 256f;
if (newRegionSizeY == 0)
newRegionSizeY = 256f;
if (targetPosition.X < edgeJitter) if (targetPosition.X < edgeJitter)
newpos.X += newRegionSizeX; newpos.X += newRegionSizeX;