diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 18bd5e5..e5d725c 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -801,7 +801,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
801 | int newSizeX = finalDestination.RegionSizeX; | 801 | int newSizeX = finalDestination.RegionSizeX; |
802 | int newSizeY = finalDestination.RegionSizeY; | 802 | int newSizeY = finalDestination.RegionSizeY; |
803 | 803 | ||
804 | bool OutSideViewRange = NeedsNewAgent(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, | 804 | bool OutSideViewRange = NeedsNewAgent(sp.RegionViewDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, |
805 | oldSizeX, oldSizeY, newSizeX, newSizeY); | 805 | oldSizeX, oldSizeY, newSizeX, newSizeY); |
806 | 806 | ||
807 | if (OutSideViewRange) | 807 | if (OutSideViewRange) |
@@ -1338,7 +1338,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1338 | // This returns 'true' if the new region already has a child agent for our | 1338 | // This returns 'true' if the new region already has a child agent for our |
1339 | // incoming agent. The implication is that, if 'false', we have to create the | 1339 | // incoming agent. The implication is that, if 'false', we have to create the |
1340 | // child and then teleport into the region. | 1340 | // child and then teleport into the region. |
1341 | protected virtual bool NeedsNewAgent(float drawdist, uint oldRegionX, uint newRegionX, uint oldRegionY, uint newRegionY, | 1341 | protected virtual bool NeedsNewAgent(float viewdist, uint oldRegionX, uint newRegionX, uint oldRegionY, uint newRegionY, |
1342 | int oldsizeX, int oldsizeY, int newsizeX, int newsizeY) | 1342 | int oldsizeX, int oldsizeY, int newsizeX, int newsizeY) |
1343 | { | 1343 | { |
1344 | if (m_regionCombinerModule != null && m_regionCombinerModule.IsRootForMegaregion(Scene.RegionInfo.RegionID)) | 1344 | if (m_regionCombinerModule != null && m_regionCombinerModule.IsRootForMegaregion(Scene.RegionInfo.RegionID)) |
@@ -1353,7 +1353,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1353 | return !(newRegionX >= swCorner.X && newRegionX <= neCorner.X && newRegionY >= swCorner.Y && newRegionY <= neCorner.Y); | 1353 | return !(newRegionX >= swCorner.X && newRegionX <= neCorner.X && newRegionY >= swCorner.Y && newRegionY <= neCorner.Y); |
1354 | } | 1354 | } |
1355 | 1355 | ||
1356 | return Util.IsOutsideView(drawdist, oldRegionX, newRegionX, oldRegionY, newRegionY, | 1356 | return Util.IsOutsideView(viewdist, oldRegionX, newRegionX, oldRegionY, newRegionY, |
1357 | oldsizeX, oldsizeY, newsizeX, newsizeY); | 1357 | oldsizeX, oldsizeY, newsizeX, newsizeY); |
1358 | } | 1358 | } |
1359 | 1359 | ||
@@ -2449,7 +2449,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
2449 | // view to include everything in the megaregion | 2449 | // view to include everything in the megaregion |
2450 | if (m_regionCombinerModule == null || !m_regionCombinerModule.IsRootForMegaregion(Scene.RegionInfo.RegionID)) | 2450 | if (m_regionCombinerModule == null || !m_regionCombinerModule.IsRootForMegaregion(Scene.RegionInfo.RegionID)) |
2451 | { | 2451 | { |
2452 | uint dd = (uint)avatar.DrawDistance; | 2452 | uint dd = (uint)avatar.RegionViewDistance; |
2453 | 2453 | ||
2454 | // until avatar movement updates client connections, we need to seend at least this current region imediate Neighbors | 2454 | // until avatar movement updates client connections, we need to seend at least this current region imediate Neighbors |
2455 | uint ddX = Math.Max(dd, Constants.RegionSize); | 2455 | uint ddX = Math.Max(dd, Constants.RegionSize); |