aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index e51c58d..d9c34e4 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -483,7 +483,7 @@ namespace OpenSim.Region.Environment.Scenes
483 } 483 }
484 484
485 /// <summary> 485 /// <summary>
486 /// 486 /// Try to teleport an agent to a new region.
487 /// </summary> 487 /// </summary>
488 /// <param name="remoteClient"></param> 488 /// <param name="remoteClient"></param>
489 /// <param name="RegionHandle"></param> 489 /// <param name="RegionHandle"></param>
@@ -530,7 +530,11 @@ namespace OpenSim.Region.Environment.Scenes
530 m_commsProvider.InterRegion.ExpectAvatarCrossing(regionHandle, avatar.ControllingClient.AgentId, 530 m_commsProvider.InterRegion.ExpectAvatarCrossing(regionHandle, avatar.ControllingClient.AgentId,
531 position, false); 531 position, false);
532 AgentCircuitData circuitdata = avatar.ControllingClient.RequestClientInfo(); 532 AgentCircuitData circuitdata = avatar.ControllingClient.RequestClientInfo();
533 string capsPath = Util.GetCapsURL(avatar.ControllingClient.AgentId); 533
534 // TODO Should construct this behind a method
535 string capsPath =
536 "http://" + reg.ExternalHostName + ":" + 9000 + "/CAPS/" + circuitdata.CapsPath + "0000/";
537
534 avatar.ControllingClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4), 538 avatar.ControllingClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4),
535 capsPath); 539 capsPath);
536 avatar.MakeChildAgent(); 540 avatar.MakeChildAgent();