diff options
| author | UbitUmarov | 2018-10-20 14:00:13 +0100 |
|---|---|---|
| committer | UbitUmarov | 2018-10-20 14:00:13 +0100 |
| commit | e7d9fe966cf501d77370fa45639e40ac2f3f6ab7 (patch) | |
| tree | 4a278ac0d610656a06caa514ced2ab8908bccaab /OpenSim | |
| parent | double Ooopss (diff) | |
| download | opensim-SC-e7d9fe966cf501d77370fa45639e40ac2f3f6ab7.zip opensim-SC-e7d9fe966cf501d77370fa45639e40ac2f3f6ab7.tar.gz opensim-SC-e7d9fe966cf501d77370fa45639e40ac2f3f6ab7.tar.bz2 opensim-SC-e7d9fe966cf501d77370fa45639e40ac2f3f6ab7.tar.xz | |
fix groups v2 agentUUI ofr uuid.zero case
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs index 9852581..a1093c9 100644 --- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs +++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs | |||
| @@ -605,14 +605,8 @@ namespace OpenSim.Groups | |||
| 605 | private string AgentUUI(string AgentIDStr) | 605 | private string AgentUUI(string AgentIDStr) |
| 606 | { | 606 | { |
| 607 | UUID AgentID = UUID.Zero; | 607 | UUID AgentID = UUID.Zero; |
| 608 | try | 608 | if (!UUID.TryParse(AgentIDStr, out AgentID) || AgentID == UUID.Zero) |
| 609 | { | 609 | return UUID.Zero.ToString(); |
| 610 | AgentID = new UUID(AgentIDStr); | ||
| 611 | } | ||
| 612 | catch (FormatException) | ||
| 613 | { | ||
| 614 | return AgentID.ToString(); | ||
| 615 | } | ||
| 616 | 610 | ||
| 617 | if (m_UserManagement.IsLocalGridUser(AgentID)) | 611 | if (m_UserManagement.IsLocalGridUser(AgentID)) |
| 618 | return AgentID.ToString(); | 612 | return AgentID.ToString(); |
| @@ -636,14 +630,8 @@ namespace OpenSim.Groups | |||
| 636 | private string AgentUUIForOutside(string AgentIDStr) | 630 | private string AgentUUIForOutside(string AgentIDStr) |
| 637 | { | 631 | { |
| 638 | UUID AgentID = UUID.Zero; | 632 | UUID AgentID = UUID.Zero; |
| 639 | try | 633 | if (!UUID.TryParse(AgentIDStr, out AgentID) || AgentID == UUID.Zero) |
| 640 | { | 634 | return UUID.Zero.ToString(); |
| 641 | AgentID = new UUID(AgentIDStr); | ||
| 642 | } | ||
| 643 | catch (FormatException) | ||
| 644 | { | ||
| 645 | return AgentID.ToString(); | ||
| 646 | } | ||
| 647 | 635 | ||
| 648 | AgentCircuitData agent = null; | 636 | AgentCircuitData agent = null; |
| 649 | foreach (Scene scene in m_Scenes) | 637 | foreach (Scene scene in m_Scenes) |