OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make fallbacks work, the destination was never actually updated with the fallback details.

avinationmerge
meta7 2010-08-08 18:56:47 -07:00
parent 680e801bf2
commit 32ccc19a62
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@ -344,9 +344,10 @@ namespace OpenSim.Services.LLLoginService
// //
// Instantiate/get the simulation interface and launch an agent at the destination // Instantiate/get the simulation interface and launch an agent at the destination
// //
string reason = string.Empty; string reason = string.Empty;
AgentCircuitData aCircuit = LaunchAgentAtGrid(gatekeeper, destination, account, avatar, session, secureSession, position, where, clientVersion, clientIP, out where, out reason); GridRegion dest;
AgentCircuitData aCircuit = LaunchAgentAtGrid(gatekeeper, destination, account, avatar, session, secureSession, position, where, clientVersion, clientIP, out where, out reason, out dest);
destination = dest;
if (aCircuit == null) if (aCircuit == null)
{ {
m_PresenceService.LogoutAgent(session); m_PresenceService.LogoutAgent(session);
@ -605,7 +606,7 @@ namespace OpenSim.Services.LLLoginService
} }
protected AgentCircuitData LaunchAgentAtGrid(GridRegion gatekeeper, GridRegion destination, UserAccount account, AvatarData avatar, protected AgentCircuitData LaunchAgentAtGrid(GridRegion gatekeeper, GridRegion destination, UserAccount account, AvatarData avatar,
UUID session, UUID secureSession, Vector3 position, string currentWhere, string viewer, IPEndPoint clientIP, out string where, out string reason) UUID session, UUID secureSession, Vector3 position, string currentWhere, string viewer, IPEndPoint clientIP, out string where, out string reason, out GridRegion dest)
{ {
where = currentWhere; where = currentWhere;
ISimulationService simConnector = null; ISimulationService simConnector = null;
@ -690,8 +691,8 @@ namespace OpenSim.Services.LLLoginService
} }
} }
} }
} }
dest = destination;
if (success) if (success)
return aCircuit; return aCircuit;
else else