OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix groups v2 agentUUI ofr uuid.zero case

0.9.1.0-post-fixes
UbitUmarov 2018-10-20 14:00:13 +01:00
parent f01e4600d1
commit e7d9fe966c
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
View File

@ -605,14 +605,8 @@ namespace OpenSim.Groups
private string AgentUUI(string AgentIDStr) private string AgentUUI(string AgentIDStr)
{ {
UUID AgentID = UUID.Zero; UUID AgentID = UUID.Zero;
try if (!UUID.TryParse(AgentIDStr, out AgentID) || AgentID == UUID.Zero)
{ return UUID.Zero.ToString();
AgentID = new UUID(AgentIDStr);
}
catch (FormatException)
{
return AgentID.ToString();
}
if (m_UserManagement.IsLocalGridUser(AgentID)) if (m_UserManagement.IsLocalGridUser(AgentID))
return AgentID.ToString(); return AgentID.ToString();
@ -636,14 +630,8 @@ namespace OpenSim.Groups
private string AgentUUIForOutside(string AgentIDStr) private string AgentUUIForOutside(string AgentIDStr)
{ {
UUID AgentID = UUID.Zero; UUID AgentID = UUID.Zero;
try if (!UUID.TryParse(AgentIDStr, out AgentID) || AgentID == UUID.Zero)
{ return UUID.Zero.ToString();
AgentID = new UUID(AgentIDStr);
}
catch (FormatException)
{
return AgentID.ToString();
}
AgentCircuitData agent = null; AgentCircuitData agent = null;
foreach (Scene scene in m_Scenes) foreach (Scene scene in m_Scenes)