diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index fead901..4b7cb5d 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -339,8 +339,9 @@ namespace OpenSim.Services.LLLoginService | |||
339 | // Instantiate/get the simulation interface and launch an agent at the destination | 339 | // Instantiate/get the simulation interface and launch an agent at the destination |
340 | // | 340 | // |
341 | string reason = string.Empty; | 341 | string reason = string.Empty; |
342 | AgentCircuitData aCircuit = LaunchAgentAtGrid(gatekeeper, destination, account, avatar, session, secureSession, position, where, clientVersion, clientIP, out where, out reason); | 342 | GridRegion dest; |
343 | 343 | AgentCircuitData aCircuit = LaunchAgentAtGrid(gatekeeper, destination, account, avatar, session, secureSession, position, where, clientVersion, clientIP, out where, out reason, out dest); | |
344 | destination = dest; | ||
344 | if (aCircuit == null) | 345 | if (aCircuit == null) |
345 | { | 346 | { |
346 | m_PresenceService.LogoutAgent(session); | 347 | m_PresenceService.LogoutAgent(session); |
@@ -599,7 +600,7 @@ namespace OpenSim.Services.LLLoginService | |||
599 | } | 600 | } |
600 | 601 | ||
601 | protected AgentCircuitData LaunchAgentAtGrid(GridRegion gatekeeper, GridRegion destination, UserAccount account, AvatarData avatar, | 602 | protected AgentCircuitData LaunchAgentAtGrid(GridRegion gatekeeper, GridRegion destination, UserAccount account, AvatarData avatar, |
602 | UUID session, UUID secureSession, Vector3 position, string currentWhere, string viewer, IPEndPoint clientIP, out string where, out string reason) | 603 | UUID session, UUID secureSession, Vector3 position, string currentWhere, string viewer, IPEndPoint clientIP, out string where, out string reason, out GridRegion dest) |
603 | { | 604 | { |
604 | where = currentWhere; | 605 | where = currentWhere; |
605 | ISimulationService simConnector = null; | 606 | ISimulationService simConnector = null; |
@@ -685,7 +686,7 @@ namespace OpenSim.Services.LLLoginService | |||
685 | } | 686 | } |
686 | } | 687 | } |
687 | } | 688 | } |
688 | 689 | dest = destination; | |
689 | if (success) | 690 | if (success) |
690 | return aCircuit; | 691 | return aCircuit; |
691 | else | 692 | else |