diff options
| author | Melanie | 2013-06-23 01:49:45 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-23 01:49:45 +0100 |
| commit | 936700bda3969bc54166f0d6a3ca81e3d5c42935 (patch) | |
| tree | 6bb97abf25f4a3f22ccb40e3b4be20c551327b09 /OpenSim/Services/LLLoginService | |
| parent | Fix prim locking to behave like SL (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-936700bda3969bc54166f0d6a3ca81e3d5c42935.zip opensim-SC_OLD-936700bda3969bc54166f0d6a3ca81e3d5c42935.tar.gz opensim-SC_OLD-936700bda3969bc54166f0d6a3ca81e3d5c42935.tar.bz2 opensim-SC_OLD-936700bda3969bc54166f0d6a3ca81e3d5c42935.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Services/LLLoginService')
| -rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 10cf90f..fe43582 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
| @@ -933,7 +933,7 @@ namespace OpenSim.Services.LLLoginService | |||
| 933 | private bool LaunchAgentIndirectly(GridRegion gatekeeper, GridRegion destination, AgentCircuitData aCircuit, IPEndPoint clientIP, out string reason) | 933 | private bool LaunchAgentIndirectly(GridRegion gatekeeper, GridRegion destination, AgentCircuitData aCircuit, IPEndPoint clientIP, out string reason) |
| 934 | { | 934 | { |
| 935 | m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName); | 935 | m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName); |
| 936 | if (m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, clientIP, out reason)) | 936 | if (m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, true, out reason)) |
| 937 | return true; | 937 | return true; |
| 938 | return false; | 938 | return false; |
| 939 | } | 939 | } |