diff options
author | Diva Canto | 2011-12-04 08:24:16 -0800 |
---|---|---|
committer | Diva Canto | 2011-12-04 08:24:16 -0800 |
commit | 080dfcc9c96c387599cf6734756a83e33a210553 (patch) | |
tree | 1b155da3b198eea49fb14c5502bb9809b8df449d /OpenSim/Services/HypergridService | |
parent | Split up test SceneHelpers to provide an AddChildScenePresence() call (diff) | |
download | opensim-SC_OLD-080dfcc9c96c387599cf6734756a83e33a210553.zip opensim-SC_OLD-080dfcc9c96c387599cf6734756a83e33a210553.tar.gz opensim-SC_OLD-080dfcc9c96c387599cf6734756a83e33a210553.tar.bz2 opensim-SC_OLD-080dfcc9c96c387599cf6734756a83e33a210553.tar.xz |
HG: Renamed one method
Diffstat (limited to 'OpenSim/Services/HypergridService')
-rw-r--r-- | OpenSim/Services/HypergridService/GatekeeperService.cs | 2 | ||||
-rw-r--r-- | OpenSim/Services/HypergridService/UserAgentService.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index e26383f..5d99c79 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
@@ -243,7 +243,7 @@ namespace OpenSim.Services.HypergridService | |||
243 | // Make sure this is the user coming home, and not a foreign user with same UUID as a local user | 243 | // Make sure this is the user coming home, and not a foreign user with same UUID as a local user |
244 | if (m_UserAgentService != null) | 244 | if (m_UserAgentService != null) |
245 | { | 245 | { |
246 | if (!m_UserAgentService.AgentIsComingHome(aCircuit.SessionID, m_ExternalName)) | 246 | if (!m_UserAgentService.IsAgentComingHome(aCircuit.SessionID, m_ExternalName)) |
247 | { | 247 | { |
248 | // Can't do, sorry | 248 | // Can't do, sorry |
249 | reason = "Unauthorized"; | 249 | reason = "Unauthorized"; |
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index 1559cf3..cdc560c 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs | |||
@@ -281,7 +281,7 @@ namespace OpenSim.Services.HypergridService | |||
281 | } | 281 | } |
282 | 282 | ||
283 | // We need to prevent foreign users with the same UUID as a local user | 283 | // We need to prevent foreign users with the same UUID as a local user |
284 | public bool AgentIsComingHome(UUID sessionID, string thisGridExternalName) | 284 | public bool IsAgentComingHome(UUID sessionID, string thisGridExternalName) |
285 | { | 285 | { |
286 | if (!m_TravelingAgents.ContainsKey(sessionID)) | 286 | if (!m_TravelingAgents.ContainsKey(sessionID)) |
287 | return false; | 287 | return false; |