aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Addons/Groups
diff options
context:
space:
mode:
authorDiva Canto2013-09-05 07:44:27 -0700
committerDiva Canto2013-09-05 07:44:27 -0700
commit04619a9b139ac67c92b5b8be9607544be2621d7e (patch)
treef1e1d8edb2e1b0235603cdca1fa950c7259b53d6 /OpenSim/Addons/Groups
parentStop "show client stats" from throwing an exception if somehow Scene.m_client... (diff)
downloadopensim-SC_OLD-04619a9b139ac67c92b5b8be9607544be2621d7e.zip
opensim-SC_OLD-04619a9b139ac67c92b5b8be9607544be2621d7e.tar.gz
opensim-SC_OLD-04619a9b139ac67c92b5b8be9607544be2621d7e.tar.bz2
opensim-SC_OLD-04619a9b139ac67c92b5b8be9607544be2621d7e.tar.xz
Restore group membership check for HG users in QueryAccess.
Diffstat (limited to 'OpenSim/Addons/Groups')
-rw-r--r--OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs9
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)