diff options
| author | Jonathan Freedman | 2010-10-21 23:22:15 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-21 23:22:15 -0400 |
| commit | d4144bedb81346301162f1e20266561fea7b621e (patch) | |
| tree | f33876acc79e1a5b688d95cc41628446d70297fa /OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |
| parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
| download | opensim-SC_OLD-d4144bedb81346301162f1e20266561fea7b621e.zip opensim-SC_OLD-d4144bedb81346301162f1e20266561fea7b621e.tar.gz opensim-SC_OLD-d4144bedb81346301162f1e20266561fea7b621e.tar.bz2 opensim-SC_OLD-d4144bedb81346301162f1e20266561fea7b621e.tar.xz | |
* change the data exchanged within hypergrid transactions
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs')
| -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 54cc80f..925af3f 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -197,8 +197,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 197 | sp.ControllingClient.SendTeleportFailed("Problem at destination"); | 197 | sp.ControllingClient.SendTeleportFailed("Problem at destination"); |
| 198 | return; | 198 | return; |
| 199 | } | 199 | } |
| 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} {2}@{3}", |
| 201 | finalDestination.RegionLocX / Constants.RegionSize, finalDestination.RegionLocY / Constants.RegionSize, finalDestination.RegionID); | 201 | finalDestination.RegionLocX / Constants.RegionSize, finalDestination.RegionLocY / Constants.RegionSize, finalDestination.RegionID, finalDestination.ServerURI); |
| 202 | 202 | ||
| 203 | // Check that these are not the same coordinates | 203 | // Check that these are not the same coordinates |
| 204 | if (finalDestination.RegionLocX == sp.Scene.RegionInfo.RegionLocX && | 204 | if (finalDestination.RegionLocX == sp.Scene.RegionInfo.RegionLocX && |
| @@ -254,8 +254,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 254 | } | 254 | } |
| 255 | 255 | ||
| 256 | m_log.DebugFormat( | 256 | m_log.DebugFormat( |
| 257 | "[ENTITY TRANSFER MODULE]: Request Teleport to {0}:{1}:{2}/{3}", | 257 | "[ENTITY TRANSFER MODULE]: Request Teleport to {0} ({1}) {2}/{3}", |
| 258 | reg.ExternalHostName, reg.HttpPort, finalDestination.RegionName, position); | 258 | reg.ServerURI, finalDestination.ServerURI, finalDestination.RegionName, position); |
| 259 | 259 | ||
| 260 | uint newRegionX = (uint)(reg.RegionHandle >> 40); | 260 | uint newRegionX = (uint)(reg.RegionHandle >> 40); |
| 261 | uint newRegionY = (((uint)(reg.RegionHandle)) >> 8); | 261 | uint newRegionY = (((uint)(reg.RegionHandle)) >> 8); |