diff options
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Services/LLLoginService/LLLoginService.cs')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 4b7cb5d..b740297 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -755,12 +755,8 @@ namespace OpenSim.Services.LLLoginService | |||
755 | private bool LaunchAgentIndirectly(GridRegion gatekeeper, GridRegion destination, AgentCircuitData aCircuit, IPEndPoint clientIP, out string reason) | 755 | private bool LaunchAgentIndirectly(GridRegion gatekeeper, GridRegion destination, AgentCircuitData aCircuit, IPEndPoint clientIP, out string reason) |
756 | { | 756 | { |
757 | m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName); | 757 | m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName); |
758 | if (m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, out reason)) | 758 | if (m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, clientIP, out reason)) |
759 | { | ||
760 | IPAddress addr = NetworkUtil.GetExternalIPOf(clientIP.Address); | ||
761 | m_UserAgentService.SetClientToken(aCircuit.SessionID, addr.ToString() /* clientIP.Address.ToString() */); | ||
762 | return true; | 759 | return true; |
763 | } | ||
764 | return false; | 760 | return false; |
765 | } | 761 | } |
766 | 762 | ||