diff options
author | Diva Canto | 2010-05-16 08:10:57 -0700 |
---|---|---|
committer | Diva Canto | 2010-05-16 08:10:57 -0700 |
commit | 49f4becdae9faf4afbf03c4e464237e323de496d (patch) | |
tree | 500cb98add91a2657f2411585e3f0c55acb45005 /OpenSim/Services | |
parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
download | opensim-SC_OLD-49f4becdae9faf4afbf03c4e464237e323de496d.zip opensim-SC_OLD-49f4becdae9faf4afbf03c4e464237e323de496d.tar.gz opensim-SC_OLD-49f4becdae9faf4afbf03c4e464237e323de496d.tar.bz2 opensim-SC_OLD-49f4becdae9faf4afbf03c4e464237e323de496d.tar.xz |
* Fixed configs in StandaloneHypergrid.ini, it still had the SQLite connection strings.
* Added a comment in LLLoginService.cs, for future reference
Diffstat (limited to 'OpenSim/Services')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 9d151df..712b899 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -746,8 +746,10 @@ 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 | // We may need to do this at some point, |
750 | m_UserAgentService.SetClientToken(aCircuit.SessionID, clientIP.Address.ToString()); | 750 | // so leaving it here in comments. |
751 | //IPAddress addr = NetworkUtil.GetIPFor(clientIP.Address, destination.ExternalEndPoint.Address); | ||
752 | m_UserAgentService.SetClientToken(aCircuit.SessionID, /*addr.Address.ToString() */ clientIP.Address.ToString()); | ||
751 | return true; | 753 | return true; |
752 | } | 754 | } |
753 | return false; | 755 | return false; |