diff options
author | UbitUmarov | 2015-08-29 03:41:43 +0100 |
---|---|---|
committer | UbitUmarov | 2015-08-29 03:41:43 +0100 |
commit | b114a04ed4f06afbdf673c28374e6e3cb9065096 (patch) | |
tree | b439791b941530d964a48ca880c82c55e33286a0 /OpenSim/Region/CoreModules | |
parent | change default scopeID to UUID.Zero (diff) | |
download | opensim-SC-b114a04ed4f06afbdf673c28374e6e3cb9065096.zip opensim-SC-b114a04ed4f06afbdf673c28374e6e3cb9065096.tar.gz opensim-SC-b114a04ed4f06afbdf673c28374e6e3cb9065096.tar.bz2 opensim-SC-b114a04ed4f06afbdf673c28374e6e3cb9065096.tar.xz |
fix NeighborRegions code
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index e3cf43c..7861a54 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -1147,7 +1147,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1147 | // Past this point we have to attempt clean up if the teleport fails, so update transfer state. | 1147 | // Past this point we have to attempt clean up if the teleport fails, so update transfer state. |
1148 | m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.Transferring); | 1148 | m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.Transferring); |
1149 | 1149 | ||
1150 | |||
1151 | // We need to set this here to avoid an unlikely race condition when teleporting to a neighbour simulator, | 1150 | // We need to set this here to avoid an unlikely race condition when teleporting to a neighbour simulator, |
1152 | // where that neighbour simulator could otherwise request a child agent create on the source which then | 1151 | // where that neighbour simulator could otherwise request a child agent create on the source which then |
1153 | // closes our existing agent which is still signalled as root. | 1152 | // closes our existing agent which is still signalled as root. |
@@ -2184,7 +2183,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
2184 | int shifty = (rRegionY - tRegionY) * (int)Constants.RegionSize; | 2183 | int shifty = (rRegionY - tRegionY) * (int)Constants.RegionSize; |
2185 | return new Vector3(shiftx, shifty, 0f); | 2184 | return new Vector3(shiftx, shifty, 0f); |
2186 | */ | 2185 | */ |
2187 | return new Vector3( sp.Scene.RegionInfo.WorldLocX - neighbour.RegionLocX, | 2186 | return new Vector3(sp.Scene.RegionInfo.WorldLocX - neighbour.RegionLocX, |
2188 | sp.Scene.RegionInfo.WorldLocY - neighbour.RegionLocY, | 2187 | sp.Scene.RegionInfo.WorldLocY - neighbour.RegionLocY, |
2189 | 0f); | 2188 | 0f); |
2190 | } | 2189 | } |
@@ -2496,10 +2495,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
2496 | uint startY = Util.RegionToWorldLoc(pRegionLocY) + m_regionInfo.RegionSizeY / 2; | 2495 | uint startY = Util.RegionToWorldLoc(pRegionLocY) + m_regionInfo.RegionSizeY / 2; |
2497 | uint endY = startY; | 2496 | uint endY = startY; |
2498 | 2497 | ||
2499 | startX -= dd; | 2498 | startX -= ddX; |
2500 | startY -= dd; | 2499 | startY -= ddY; |
2501 | endX += dd; | 2500 | endX += ddX; |
2502 | endY += dd; | 2501 | endY += ddY; |
2503 | 2502 | ||
2504 | neighbours | 2503 | neighbours |
2505 | = avatar.Scene.GridService.GetRegionRange( | 2504 | = avatar.Scene.GridService.GetRegionRange( |