diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/HypergridService/UserAccountCache.cs | 5 | ||||
-rw-r--r-- | OpenSim/Services/HypergridService/UserAgentService.cs | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/OpenSim/Services/HypergridService/UserAccountCache.cs b/OpenSim/Services/HypergridService/UserAccountCache.cs index 65f9dd5..e0a3e61 100644 --- a/OpenSim/Services/HypergridService/UserAccountCache.cs +++ b/OpenSim/Services/HypergridService/UserAccountCache.cs | |||
@@ -90,6 +90,11 @@ namespace OpenSim.Services.HypergridService | |||
90 | return null; | 90 | return null; |
91 | } | 91 | } |
92 | 92 | ||
93 | public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string query) | ||
94 | { | ||
95 | return null; | ||
96 | } | ||
97 | |||
93 | public List<UserAccount> GetUserAccounts(UUID scopeID, string query) | 98 | public List<UserAccount> GetUserAccounts(UUID scopeID, string query) |
94 | { | 99 | { |
95 | return null; | 100 | return null; |
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index 6a5007f..842ca58 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs | |||
@@ -309,13 +309,11 @@ namespace OpenSim.Services.HypergridService | |||
309 | 309 | ||
310 | if (m_TravelingAgents.ContainsKey(sessionID)) | 310 | if (m_TravelingAgents.ContainsKey(sessionID)) |
311 | { | 311 | { |
312 | bool result = m_TravelingAgents[sessionID].ClientIPAddress == reportedIP || | 312 | m_log.DebugFormat("[USER AGENT SERVICE]: Comparing with login IP {0} and MyIP {1}", |
313 | m_TravelingAgents[sessionID].MyIpAddress == reportedIP; // NATed | 313 | m_TravelingAgents[sessionID].ClientIPAddress, m_TravelingAgents[sessionID].MyIpAddress); |
314 | |||
315 | m_log.DebugFormat("[USER AGENT SERVICE]: Comparing {0} with login IP {1} and MyIP {1}; result is {3}", | ||
316 | reportedIP, m_TravelingAgents[sessionID].ClientIPAddress, m_TravelingAgents[sessionID].MyIpAddress, result); | ||
317 | 314 | ||
318 | return result; | 315 | return m_TravelingAgents[sessionID].ClientIPAddress == reportedIP || |
316 | m_TravelingAgents[sessionID].MyIpAddress == reportedIP; // NATed | ||
319 | } | 317 | } |
320 | 318 | ||
321 | return false; | 319 | return false; |