aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-08-27 17:25:04 -0700
committerDiva Canto2010-08-27 17:25:04 -0700
commit0f95cd209e8f336ae912dd89f2d15b156f1355d2 (patch)
tree6f7b73af22815f753813668cf788329a83da2474
parentImprove liveness by operating on list copies of SOG.Children where appropriate (diff)
downloadopensim-SC_OLD-0f95cd209e8f336ae912dd89f2d15b156f1355d2.zip
opensim-SC_OLD-0f95cd209e8f336ae912dd89f2d15b156f1355d2.tar.gz
opensim-SC_OLD-0f95cd209e8f336ae912dd89f2d15b156f1355d2.tar.bz2
opensim-SC_OLD-0f95cd209e8f336ae912dd89f2d15b156f1355d2.tar.xz
Addresses mantis #4991 -- HG between two regions with the same map coordinates fails with no warning
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index bb98dba..81f49b6 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -200,6 +200,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
200 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Final destination is x={0} y={1} uuid={2}", 200 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Final destination is x={0} y={1} uuid={2}",
201 finalDestination.RegionLocX / Constants.RegionSize, finalDestination.RegionLocY / Constants.RegionSize, finalDestination.RegionID); 201 finalDestination.RegionLocX / Constants.RegionSize, finalDestination.RegionLocY / Constants.RegionSize, finalDestination.RegionID);
202 202
203 // Check that these are not the same coordinates
204 if (finalDestination.RegionLocX == sp.Scene.RegionInfo.RegionLocX &&
205 finalDestination.RegionLocY == sp.Scene.RegionInfo.RegionLocY)
206 {
207 // Can't do. Viewer crashes
208 sp.ControllingClient.SendTeleportFailed("Space warp! You would crash. Move to a different region and try again.");
209 return;
210 }
211
203 // 212 //
204 // This is it 213 // This is it
205 // 214 //