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 49c7f89..a49993c 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs | |||
@@ -313,13 +313,11 @@ namespace OpenSim.Services.HypergridService | |||
313 | 313 | ||
314 | if (m_TravelingAgents.ContainsKey(sessionID)) | 314 | if (m_TravelingAgents.ContainsKey(sessionID)) |
315 | { | 315 | { |
316 | bool result = m_TravelingAgents[sessionID].ClientIPAddress == reportedIP || | 316 | m_log.DebugFormat("[USER AGENT SERVICE]: Comparing with login IP {0} and MyIP {1}", |
317 | m_TravelingAgents[sessionID].MyIpAddress == reportedIP; // NATed | 317 | m_TravelingAgents[sessionID].ClientIPAddress, m_TravelingAgents[sessionID].MyIpAddress); |
318 | |||
319 | m_log.DebugFormat("[USER AGENT SERVICE]: Comparing {0} with login IP {1} and MyIP {1}; result is {3}", | ||
320 | reportedIP, m_TravelingAgents[sessionID].ClientIPAddress, m_TravelingAgents[sessionID].MyIpAddress, result); | ||
321 | 318 | ||
322 | return result; | 319 | return m_TravelingAgents[sessionID].ClientIPAddress == reportedIP || |
320 | m_TravelingAgents[sessionID].MyIpAddress == reportedIP; // NATed | ||
323 | } | 321 | } |
324 | 322 | ||
325 | return false; | 323 | return false; |