diff options
author | Teravus Ovares (Dan Olivares) | 2010-05-16 01:48:28 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2010-05-16 01:48:28 -0400 |
commit | a974146921121c2965cfc60bd6158c76989ebd98 (patch) | |
tree | 42089c05aaa3a28af3a22f97badea89275a15899 /OpenSim/Services/LLLoginService | |
parent | * Revert last commit for now at Melanie_T's request. (diff) | |
parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-a974146921121c2965cfc60bd6158c76989ebd98.zip opensim-SC_OLD-a974146921121c2965cfc60bd6158c76989ebd98.tar.gz opensim-SC_OLD-a974146921121c2965cfc60bd6158c76989ebd98.tar.bz2 opensim-SC_OLD-a974146921121c2965cfc60bd6158c76989ebd98.tar.xz |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Services/LLLoginService')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 7471c77..9d151df 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -746,6 +746,7 @@ namespace OpenSim.Services.LLLoginService | |||
746 | m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName); | 746 | m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName); |
747 | if (m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, out reason)) | 747 | if (m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, out reason)) |
748 | { | 748 | { |
749 | //IPAddress addr = NetworkUtil.GetIPFor(clientIP.Address, gatekeeper.ExternalEndPoint.Address); | ||
749 | m_UserAgentService.SetClientToken(aCircuit.SessionID, clientIP.Address.ToString()); | 750 | m_UserAgentService.SetClientToken(aCircuit.SessionID, clientIP.Address.ToString()); |
750 | return true; | 751 | return true; |
751 | } | 752 | } |