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

Merge branch 'master' into careminster-presence-refactor

avinationmerge
Melanie 2010-08-09 02:27:54 +01:00
parent bef6fa37b9 144fc20e87
commit 1f052520ae
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -344,9 +344,9 @@ 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;
GridRegion dest; GridRegion dest;
AgentCircuitData aCircuit = LaunchAgentAtGrid(gatekeeper, destination, account, avatar, session, secureSession, position, where, clientVersion, clientIP, out where, out reason, out dest); AgentCircuitData aCircuit = LaunchAgentAtGrid(gatekeeper, destination, account, avatar, session, secureSession, position, where, clientVersion, clientIP, out where, out reason, out dest);
destination = dest; destination = dest;
if (aCircuit == null) if (aCircuit == null)
{ {
@ -691,7 +691,11 @@ namespace OpenSim.Services.LLLoginService
} }
} }
} }
<<<<<<< HEAD:OpenSim/Services/LLLoginService/LLLoginService.cs
} }
=======
}
>>>>>>> master:OpenSim/Services/LLLoginService/LLLoginService.cs
dest = destination; dest = destination;
if (success) if (success)
return aCircuit; return aCircuit;