HG: Renamed one method
parent
a82aea53f8
commit
080dfcc9c9
|
@ -143,7 +143,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
|
||||||
UUID.TryParse(sessionID_str, out sessionID);
|
UUID.TryParse(sessionID_str, out sessionID);
|
||||||
string gridName = (string)requestData["externalName"];
|
string gridName = (string)requestData["externalName"];
|
||||||
|
|
||||||
bool success = m_HomeUsersService.AgentIsComingHome(sessionID, gridName);
|
bool success = m_HomeUsersService.IsAgentComingHome(sessionID, gridName);
|
||||||
|
|
||||||
Hashtable hash = new Hashtable();
|
Hashtable hash = new Hashtable();
|
||||||
hash["result"] = success.ToString();
|
hash["result"] = success.ToString();
|
||||||
|
|
|
@ -358,7 +358,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool AgentIsComingHome(UUID sessionID, string thisGridExternalName)
|
public bool IsAgentComingHome(UUID sessionID, string thisGridExternalName)
|
||||||
{
|
{
|
||||||
Hashtable hash = new Hashtable();
|
Hashtable hash = new Hashtable();
|
||||||
hash["sessionID"] = sessionID.ToString();
|
hash["sessionID"] = sessionID.ToString();
|
||||||
|
|
|
@ -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
|
// 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 != null)
|
||||||
{
|
{
|
||||||
if (!m_UserAgentService.AgentIsComingHome(aCircuit.SessionID, m_ExternalName))
|
if (!m_UserAgentService.IsAgentComingHome(aCircuit.SessionID, m_ExternalName))
|
||||||
{
|
{
|
||||||
// Can't do, sorry
|
// Can't do, sorry
|
||||||
reason = "Unauthorized";
|
reason = "Unauthorized";
|
||||||
|
|
|
@ -281,7 +281,7 @@ namespace OpenSim.Services.HypergridService
|
||||||
}
|
}
|
||||||
|
|
||||||
// We need to prevent foreign users with the same UUID as a local user
|
// 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))
|
if (!m_TravelingAgents.ContainsKey(sessionID))
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -65,7 +65,7 @@ namespace OpenSim.Services.Interfaces
|
||||||
List<UUID> StatusNotification(List<string> friends, UUID userID, bool online);
|
List<UUID> StatusNotification(List<string> friends, UUID userID, bool online);
|
||||||
//List<UUID> GetOnlineFriends(UUID userID, List<string> friends);
|
//List<UUID> GetOnlineFriends(UUID userID, List<string> friends);
|
||||||
|
|
||||||
bool AgentIsComingHome(UUID sessionID, string thisGridExternalName);
|
bool IsAgentComingHome(UUID sessionID, string thisGridExternalName);
|
||||||
bool VerifyAgent(UUID sessionID, string token);
|
bool VerifyAgent(UUID sessionID, string token);
|
||||||
bool VerifyClient(UUID sessionID, string reportedIP);
|
bool VerifyClient(UUID sessionID, string reportedIP);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue