diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index c3d0765..1bb3e3b 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -491,8 +491,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
491 | } | 491 | } |
492 | 492 | ||
493 | // Check that these are not the same coordinates | 493 | // Check that these are not the same coordinates |
494 | if (finalDestination.RegionLocX == sp.Scene.RegionInfo.LegacyRegionLocX && | 494 | if (finalDestination.RegionLocX == sp.Scene.RegionInfo.RegionLocX && |
495 | finalDestination.RegionLocY == sp.Scene.RegionInfo.LegacyRegionLocY) | 495 | finalDestination.RegionLocY == sp.Scene.RegionInfo.RegionLocY) |
496 | { | 496 | { |
497 | // Can't do. Viewer crashes | 497 | // Can't do. Viewer crashes |
498 | sp.ControllingClient.SendTeleportFailed("Space warp! You would crash. Move to a different region and try again."); | 498 | sp.ControllingClient.SendTeleportFailed("Space warp! You would crash. Move to a different region and try again."); |
@@ -564,8 +564,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
564 | // destRegionX, destRegionY, finalDestination.RegionID, finalDestination.ServerURI); | 564 | // destRegionX, destRegionY, finalDestination.RegionID, finalDestination.ServerURI); |
565 | 565 | ||
566 | // Insanely, RegionLoc on RegionInfo is the 256m map co-ord whilst GridRegion.RegionLoc is the raw meters position. | 566 | // Insanely, RegionLoc on RegionInfo is the 256m map co-ord whilst GridRegion.RegionLoc is the raw meters position. |
567 | return Math.Abs(sourceRegion.LegacyRegionLocX - destRegion.RegionCoordX) <= MaxTransferDistance | 567 | return Math.Abs(sourceRegion.RegionLocX - destRegion.RegionCoordX) <= MaxTransferDistance |
568 | && Math.Abs(sourceRegion.LegacyRegionLocY - destRegion.RegionCoordY) <= MaxTransferDistance; | 568 | && Math.Abs(sourceRegion.RegionLocY - destRegion.RegionCoordY) <= MaxTransferDistance; |
569 | } | 569 | } |
570 | 570 | ||
571 | /// <summary> | 571 | /// <summary> |
@@ -632,7 +632,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
632 | string.Format( | 632 | string.Format( |
633 | "Can't teleport to {0} ({1},{2}) from {3} ({4},{5}), destination is more than {6} regions way", | 633 | "Can't teleport to {0} ({1},{2}) from {3} ({4},{5}), destination is more than {6} regions way", |
634 | finalDestination.RegionName, finalDestination.RegionCoordX, finalDestination.RegionCoordY, | 634 | finalDestination.RegionName, finalDestination.RegionCoordX, finalDestination.RegionCoordY, |
635 | sourceRegion.RegionName, sourceRegion.LegacyRegionLocX, sourceRegion.LegacyRegionLocY, | 635 | sourceRegion.RegionName, sourceRegion.RegionLocX, sourceRegion.RegionLocY, |
636 | MaxTransferDistance)); | 636 | MaxTransferDistance)); |
637 | 637 | ||
638 | return; | 638 | return; |
@@ -1919,7 +1919,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1919 | 1919 | ||
1920 | if (m_regionInfo != null) | 1920 | if (m_regionInfo != null) |
1921 | { | 1921 | { |
1922 | neighbours = RequestNeighbours(sp, m_regionInfo.LegacyRegionLocX, m_regionInfo.LegacyRegionLocY); | 1922 | neighbours = RequestNeighbours(sp, m_regionInfo.RegionLocX, m_regionInfo.RegionLocY); |
1923 | } | 1923 | } |
1924 | else | 1924 | else |
1925 | { | 1925 | { |
@@ -2244,10 +2244,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
2244 | extent.X = ((int)extent.X / (int)Constants.RegionSize); | 2244 | extent.X = ((int)extent.X / (int)Constants.RegionSize); |
2245 | extent.Y = ((int)extent.Y / (int)Constants.RegionSize); | 2245 | extent.Y = ((int)extent.Y / (int)Constants.RegionSize); |
2246 | 2246 | ||
2247 | swCorner.X = Scene.RegionInfo.LegacyRegionLocX - 1; | 2247 | swCorner.X = Scene.RegionInfo.RegionLocX - 1; |
2248 | swCorner.Y = Scene.RegionInfo.LegacyRegionLocY - 1; | 2248 | swCorner.Y = Scene.RegionInfo.RegionLocY - 1; |
2249 | neCorner.X = Scene.RegionInfo.LegacyRegionLocX + extent.X; | 2249 | neCorner.X = Scene.RegionInfo.RegionLocX + extent.X; |
2250 | neCorner.Y = Scene.RegionInfo.LegacyRegionLocY + extent.Y; | 2250 | neCorner.Y = Scene.RegionInfo.RegionLocY + extent.Y; |
2251 | } | 2251 | } |
2252 | 2252 | ||
2253 | /// <summary> | 2253 | /// <summary> |
@@ -2560,8 +2560,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
2560 | Vector3 oldGroupPosition = grp.RootPart.GroupPosition; | 2560 | Vector3 oldGroupPosition = grp.RootPart.GroupPosition; |
2561 | 2561 | ||
2562 | // Compute the absolute position of the object. | 2562 | // Compute the absolute position of the object. |
2563 | double objectWorldLocX = (double)scene.RegionInfo.RegionWorldLocX + attemptedPosition.X; | 2563 | double objectWorldLocX = (double)scene.RegionInfo.WorldLocX + attemptedPosition.X; |
2564 | double objectWorldLocY = (double)scene.RegionInfo.RegionWorldLocY + attemptedPosition.Y; | 2564 | double objectWorldLocY = (double)scene.RegionInfo.WorldLocY + attemptedPosition.Y; |
2565 | 2565 | ||
2566 | // Ask the grid service for the region that contains the passed address | 2566 | // Ask the grid service for the region that contains the passed address |
2567 | GridRegion destination = GetRegionContainingWorldLocation(scene.GridService, scene.RegionInfo.ScopeID, objectWorldLocX, objectWorldLocY); | 2567 | GridRegion destination = GetRegionContainingWorldLocation(scene.GridService, scene.RegionInfo.ScopeID, objectWorldLocX, objectWorldLocY); |