diff options
author | UbitUmarov | 2014-10-24 18:44:08 +0100 |
---|---|---|
committer | UbitUmarov | 2014-10-24 18:44:08 +0100 |
commit | 21242205d1551b0d87712cabcfaa572f32d3dcc6 (patch) | |
tree | 022ea44dcec4771d93fec62885200b7905f1b2b2 /OpenSim/Region/CoreModules/Framework/EntityTransfer | |
parent | check new region size on added code for varsize till its fully suported (diff) | |
download | opensim-SC_OLD-21242205d1551b0d87712cabcfaa572f32d3dcc6.zip opensim-SC_OLD-21242205d1551b0d87712cabcfaa572f32d3dcc6.tar.gz opensim-SC_OLD-21242205d1551b0d87712cabcfaa572f32d3dcc6.tar.bz2 opensim-SC_OLD-21242205d1551b0d87712cabcfaa572f32d3dcc6.tar.xz |
add more temporary fixes for regionSize zero
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index e3f101e..afc73ec 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -1518,6 +1518,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1518 | */ | 1518 | */ |
1519 | float regionSizeX = regInfo.RegionSizeX; | 1519 | float regionSizeX = regInfo.RegionSizeX; |
1520 | float regionSizeY = regInfo.RegionSizeY; | 1520 | float regionSizeY = regInfo.RegionSizeY; |
1521 | if (regionSizeX == 0) | ||
1522 | regionSizeX = 256f; | ||
1523 | if (regionSizeY == 0) | ||
1524 | regionSizeY = 256f; | ||
1521 | 1525 | ||
1522 | if (pos.X < boundaryDistance) | 1526 | if (pos.X < boundaryDistance) |
1523 | neighbourx--; | 1527 | neighbourx--; |
@@ -2446,6 +2450,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
2446 | int neighboury = (int)srcRegionInfo.RegionLocY; | 2450 | int neighboury = (int)srcRegionInfo.RegionLocY; |
2447 | float regionSizeX = srcRegionInfo.RegionSizeX; | 2451 | float regionSizeX = srcRegionInfo.RegionSizeX; |
2448 | float regionSizeY = srcRegionInfo.RegionSizeY; | 2452 | float regionSizeY = srcRegionInfo.RegionSizeY; |
2453 | if (regionSizeX == 0) | ||
2454 | regionSizeX = 256f; | ||
2455 | if (regionSizeY == 0) | ||
2456 | regionSizeY = 256f; | ||
2449 | 2457 | ||
2450 | float edgeJitter = 0.2f; | 2458 | float edgeJitter = 0.2f; |
2451 | 2459 | ||
@@ -2470,6 +2478,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
2470 | 2478 | ||
2471 | float newRegionSizeX = neighbourRegion.RegionSizeX; | 2479 | float newRegionSizeX = neighbourRegion.RegionSizeX; |
2472 | float newRegionSizeY = neighbourRegion.RegionSizeY; | 2480 | float newRegionSizeY = neighbourRegion.RegionSizeY; |
2481 | if (newRegionSizeX == 0) | ||
2482 | newRegionSizeX = 256f; | ||
2483 | if (newRegionSizeY == 0) | ||
2484 | newRegionSizeY = 256f; | ||
2473 | 2485 | ||
2474 | if (targetPosition.X < edgeJitter) | 2486 | if (targetPosition.X < edgeJitter) |
2475 | newpos.X += newRegionSizeX; | 2487 | newpos.X += newRegionSizeX; |