diff options
author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs | |
parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs')
-rw-r--r-- | OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs index 4642b2a..7d48516 100644 --- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs +++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs | |||
@@ -623,10 +623,13 @@ namespace OpenSim.Groups | |||
623 | if (agent != null) | 623 | if (agent != null) |
624 | break; | 624 | break; |
625 | } | 625 | } |
626 | if (agent == null) // oops | 626 | if (agent != null) |
627 | return AgentID.ToString(); | 627 | return Util.ProduceUserUniversalIdentifier(agent); |
628 | |||
629 | // we don't know anything about this foreign user | ||
630 | // try asking the user management module, which may know more | ||
631 | return m_UserManagement.GetUserUUI(AgentID); | ||
628 | 632 | ||
629 | return Util.ProduceUserUniversalIdentifier(agent); | ||
630 | } | 633 | } |
631 | 634 | ||
632 | private string AgentUUIForOutside(string AgentIDStr) | 635 | private string AgentUUIForOutside(string AgentIDStr) |