diff options
| author | Justin Clark-Casey (justincc) | 2010-08-28 02:41:00 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-08-28 02:41:00 +0100 |
| commit | 83fbf664448bfe9e7b13b907efbeee5c5e3f7b7d (patch) | |
| tree | 327ff101f6353a658cde774d7ddb68d2c8336e23 | |
| parent | very minor log message and var name tweaking for iar saving (diff) | |
| parent | Addresses mantis #4991 -- HG between two regions with the same map coordinate... (diff) | |
| download | opensim-SC-83fbf664448bfe9e7b13b907efbeee5c5e3f7b7d.zip opensim-SC-83fbf664448bfe9e7b13b907efbeee5c5e3f7b7d.tar.gz opensim-SC-83fbf664448bfe9e7b13b907efbeee5c5e3f7b7d.tar.bz2 opensim-SC-83fbf664448bfe9e7b13b907efbeee5c5e3f7b7d.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 9 |
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 | // |