Merge branch 'master' into careminster-presence-refactor

1 files changed, 6 insertions, 2 deletions

diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 83c3dd0..602616f 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -344,9 +344,9 @@ namespace OpenSim.Services.LLLoginService
                 //
                 // Instantiate/get the simulation interface and launch an agent at the destination
                 //
-                string reason = string.Empty;

+                string reason = string.Empty;
                 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;
                 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;
             if (success)
                 return aCircuit;