From 080dfcc9c96c387599cf6734756a83e33a210553 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 4 Dec 2011 08:24:16 -0800 Subject: [PATCH] HG: Renamed one method --- OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs | 2 +- .../Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | 2 +- OpenSim/Services/HypergridService/GatekeeperService.cs | 2 +- OpenSim/Services/HypergridService/UserAgentService.cs | 2 +- OpenSim/Services/Interfaces/IHypergridServices.cs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs index 72a4aeaa62..50010f2dfb 100644 --- a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs @@ -143,7 +143,7 @@ namespace OpenSim.Server.Handlers.Hypergrid UUID.TryParse(sessionID_str, out sessionID); string gridName = (string)requestData["externalName"]; - bool success = m_HomeUsersService.AgentIsComingHome(sessionID, gridName); + bool success = m_HomeUsersService.IsAgentComingHome(sessionID, gridName); Hashtable hash = new Hashtable(); hash["result"] = success.ToString(); diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs index 63aabad04f..7a4ec57997 100644 --- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs @@ -358,7 +358,7 @@ namespace OpenSim.Services.Connectors.Hypergrid return null; } - public bool AgentIsComingHome(UUID sessionID, string thisGridExternalName) + public bool IsAgentComingHome(UUID sessionID, string thisGridExternalName) { Hashtable hash = new Hashtable(); hash["sessionID"] = sessionID.ToString(); diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index e26383f0ff..5d99c79ac8 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs @@ -243,7 +243,7 @@ namespace OpenSim.Services.HypergridService // Make sure this is the user coming home, and not a foreign user with same UUID as a local user if (m_UserAgentService != null) { - if (!m_UserAgentService.AgentIsComingHome(aCircuit.SessionID, m_ExternalName)) + if (!m_UserAgentService.IsAgentComingHome(aCircuit.SessionID, m_ExternalName)) { // Can't do, sorry reason = "Unauthorized"; diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index 1559cf3205..cdc560c4f5 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs @@ -281,7 +281,7 @@ namespace OpenSim.Services.HypergridService } // We need to prevent foreign users with the same UUID as a local user - public bool AgentIsComingHome(UUID sessionID, string thisGridExternalName) + public bool IsAgentComingHome(UUID sessionID, string thisGridExternalName) { if (!m_TravelingAgents.ContainsKey(sessionID)) return false; diff --git a/OpenSim/Services/Interfaces/IHypergridServices.cs b/OpenSim/Services/Interfaces/IHypergridServices.cs index 220caef007..e86ec519e5 100644 --- a/OpenSim/Services/Interfaces/IHypergridServices.cs +++ b/OpenSim/Services/Interfaces/IHypergridServices.cs @@ -65,7 +65,7 @@ namespace OpenSim.Services.Interfaces List StatusNotification(List friends, UUID userID, bool online); //List GetOnlineFriends(UUID userID, List friends); - bool AgentIsComingHome(UUID sessionID, string thisGridExternalName); + bool IsAgentComingHome(UUID sessionID, string thisGridExternalName); bool VerifyAgent(UUID sessionID, string token); bool VerifyClient(UUID sessionID, string reportedIP); }