diff options
| author | Melanie | 2013-06-23 01:59:57 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-23 01:59:57 +0100 |
| commit | f70357eaa355b8c152f3d793d0fceafa14df5fd4 (patch) | |
| tree | ffda32c340bd7f6d69652e9d9a959c7396f42a2f /OpenSim/Services/LLLoginService | |
| parent | Merge branch 'avination-current' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.zip opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.tar.gz opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.tar.bz2 opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
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 81712f6..faf7f71 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
| @@ -941,7 +941,7 @@ namespace OpenSim.Services.LLLoginService | |||
| 941 | private bool LaunchAgentIndirectly(GridRegion gatekeeper, GridRegion destination, AgentCircuitData aCircuit, IPEndPoint clientIP, out string reason) | 941 | private bool LaunchAgentIndirectly(GridRegion gatekeeper, GridRegion destination, AgentCircuitData aCircuit, IPEndPoint clientIP, out string reason) |
| 942 | { | 942 | { |
| 943 | m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName); | 943 | m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName); |
| 944 | if (m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, clientIP, out reason)) | 944 | if (m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, true, out reason)) |
| 945 | return true; | 945 | return true; |
| 946 | return false; | 946 | return false; |
| 947 | } | 947 | } |