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 | |
parent | Split up test SceneHelpers to provide an AddChildScenePresence() call (diff) | |
download | opensim-SC-080dfcc9c96c387599cf6734756a83e33a210553.zip opensim-SC-080dfcc9c96c387599cf6734756a83e33a210553.tar.gz opensim-SC-080dfcc9c96c387599cf6734756a83e33a210553.tar.bz2 opensim-SC-080dfcc9c96c387599cf6734756a83e33a210553.tar.xz |
HG: Renamed one method
Diffstat (limited to 'OpenSim')
5 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs index 72a4aea..50010f2 100644 --- a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs | |||
@@ -143,7 +143,7 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
143 | UUID.TryParse(sessionID_str, out sessionID); | 143 | UUID.TryParse(sessionID_str, out sessionID); |
144 | string gridName = (string)requestData["externalName"]; | 144 | string gridName = (string)requestData["externalName"]; |
145 | 145 | ||
146 | bool success = m_HomeUsersService.AgentIsComingHome(sessionID, gridName); | 146 | bool success = m_HomeUsersService.IsAgentComingHome(sessionID, gridName); |
147 | 147 | ||
148 | Hashtable hash = new Hashtable(); | 148 | Hashtable hash = new Hashtable(); |
149 | hash["result"] = success.ToString(); | 149 | hash["result"] = success.ToString(); |
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs index 63aabad..7a4ec57 100644 --- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | |||
@@ -358,7 +358,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
358 | return null; | 358 | return null; |
359 | } | 359 | } |
360 | 360 | ||
361 | public bool AgentIsComingHome(UUID sessionID, string thisGridExternalName) | 361 | public bool IsAgentComingHome(UUID sessionID, string thisGridExternalName) |
362 | { | 362 | { |
363 | Hashtable hash = new Hashtable(); | 363 | Hashtable hash = new Hashtable(); |
364 | hash["sessionID"] = sessionID.ToString(); | 364 | hash["sessionID"] = sessionID.ToString(); |
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; |
diff --git a/OpenSim/Services/Interfaces/IHypergridServices.cs b/OpenSim/Services/Interfaces/IHypergridServices.cs index 220caef..e86ec51 100644 --- a/OpenSim/Services/Interfaces/IHypergridServices.cs +++ b/OpenSim/Services/Interfaces/IHypergridServices.cs | |||
@@ -65,7 +65,7 @@ namespace OpenSim.Services.Interfaces | |||
65 | List<UUID> StatusNotification(List<string> friends, UUID userID, bool online); | 65 | List<UUID> StatusNotification(List<string> friends, UUID userID, bool online); |
66 | //List<UUID> GetOnlineFriends(UUID userID, List<string> friends); | 66 | //List<UUID> GetOnlineFriends(UUID userID, List<string> friends); |
67 | 67 | ||
68 | bool AgentIsComingHome(UUID sessionID, string thisGridExternalName); | 68 | bool IsAgentComingHome(UUID sessionID, string thisGridExternalName); |
69 | bool VerifyAgent(UUID sessionID, string token); | 69 | bool VerifyAgent(UUID sessionID, string token); |
70 | bool VerifyClient(UUID sessionID, string reportedIP); | 70 | bool VerifyClient(UUID sessionID, string reportedIP); |
71 | } | 71 | } |