aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/EntityTransfer
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs15
1 files changed, 12 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 8da76df..8a16943 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -379,8 +379,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
379 Vector3 emergencyPos = new Vector3(128, 128, 128); 379 Vector3 emergencyPos = new Vector3(128, 128, 128);
380 380
381 m_log.WarnFormat( 381 m_log.WarnFormat(
382 "[ENTITY TRANSFER MODULE]: RequestTeleportToLocation() was given an illegal position of {0} for avatar {1}, {2}. Substituting {3}", 382 "[ENTITY TRANSFER MODULE]: RequestTeleportToLocation() was given an illegal position of {0} for avatar {1}, {2} in {3}. Substituting {4}",
383 position, sp.Name, sp.UUID, emergencyPos); 383 position, sp.Name, sp.UUID, Scene.Name, emergencyPos);
384 384
385 position = emergencyPos; 385 position = emergencyPos;
386 } 386 }
@@ -1346,7 +1346,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1346 Scene initiatingScene) 1346 Scene initiatingScene)
1347 { 1347 {
1348 Thread.Sleep(10000); 1348 Thread.Sleep(10000);
1349 1349
1350 agent.Scene.RequestTeleportLocation(
1351 agent.ControllingClient,
1352 Utils.UIntsToLong(regionX * (uint)Constants.RegionSize, regionY * (uint)Constants.RegionSize),
1353 position,
1354 agent.Lookat,
1355 (uint)Constants.TeleportFlags.ViaLocation);
1356
1357 /*
1350 IMessageTransferModule im = initiatingScene.RequestModuleInterface<IMessageTransferModule>(); 1358 IMessageTransferModule im = initiatingScene.RequestModuleInterface<IMessageTransferModule>();
1351 if (im != null) 1359 if (im != null)
1352 { 1360 {
@@ -1381,6 +1389,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1381 }); 1389 });
1382 1390
1383 } 1391 }
1392 */
1384 } 1393 }
1385 1394
1386 private void InformClientToInitiateTeleportToLocationCompleted(IAsyncResult iar) 1395 private void InformClientToInitiateTeleportToLocationCompleted(IAsyncResult iar)