aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs15
1 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index cd588e5..9766a25 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -53,7 +53,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
53 public const int DefaultMaxTransferDistance = 4095; 53 public const int DefaultMaxTransferDistance = 4095;
54 public const bool EnableWaitForCallbackFromTeleportDestDefault = true; 54 public const bool EnableWaitForCallbackFromTeleportDestDefault = true;
55 55
56
57 /// <summary> 56 /// <summary>
58 /// The maximum distance, in standard region units (256m) that an agent is allowed to transfer. 57 /// The maximum distance, in standard region units (256m) that an agent is allowed to transfer.
59 /// </summary> 58 /// </summary>
@@ -531,8 +530,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
531 { 530 {
532 // Region doesn't take it 531 // Region doesn't take it
533 m_log.WarnFormat( 532 m_log.WarnFormat(
534 "[ENTITY TRANSFER MODULE]: UpdateAgent failed on teleport of {0} to {1}. Returning avatar to source region.", 533 "[ENTITY TRANSFER MODULE]: UpdateAgent failed on teleport of {0} to {1} from {2}. Returning avatar to source region.",
535 sp.Name, finalDestination.RegionName); 534 sp.Name, finalDestination.RegionName, sp.Scene.RegionInfo.RegionName);
536 535
537 Fail(sp, finalDestination, logout); 536 Fail(sp, finalDestination, logout);
538 return; 537 return;
@@ -564,8 +563,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
564 if (EnableWaitForCallbackFromTeleportDest && !WaitForCallback(sp.UUID)) 563 if (EnableWaitForCallbackFromTeleportDest && !WaitForCallback(sp.UUID))
565 { 564 {
566 m_log.WarnFormat( 565 m_log.WarnFormat(
567 "[ENTITY TRANSFER MODULE]: Teleport of {0} to {1} failed due to no callback from destination region. Returning avatar to source region.", 566 "[ENTITY TRANSFER MODULE]: Teleport of {0} to {1} from {2} failed due to no callback from destination region. Returning avatar to source region.",
568 sp.Name, finalDestination.RegionName); 567 sp.Name, finalDestination.RegionName, sp.Scene.RegionInfo.RegionName);
569 568
570 Fail(sp, finalDestination, logout); 569 Fail(sp, finalDestination, logout);
571 return; 570 return;
@@ -661,8 +660,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
661 protected virtual void SetCallbackURL(AgentData agent, RegionInfo region) 660 protected virtual void SetCallbackURL(AgentData agent, RegionInfo region)
662 { 661 {
663 agent.CallbackURI = region.ServerURI + "agent/" + agent.AgentID.ToString() + "/" + region.RegionID.ToString() + "/release/"; 662 agent.CallbackURI = region.ServerURI + "agent/" + agent.AgentID.ToString() + "/" + region.RegionID.ToString() + "/release/";
664 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Set callback URL to {0}", agent.CallbackURI);
665 663
664 m_log.DebugFormat(
665 "[ENTITY TRANSFER MODULE]: Set release callback URL to {0} in {1}",
666 agent.CallbackURI, region.RegionName);
666 } 667 }
667 668
668 protected virtual void AgentHasMovedAway(ScenePresence sp, bool logout) 669 protected virtual void AgentHasMovedAway(ScenePresence sp, bool logout)
@@ -2014,4 +2015,4 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
2014 #endregion 2015 #endregion
2015 2016
2016 } 2017 }
2017} 2018} \ No newline at end of file