diff options
author | Diva Canto | 2013-09-05 07:44:27 -0700 |
---|---|---|
committer | Diva Canto | 2013-09-05 07:48:10 -0700 |
commit | e2b7d941b601bfeb5923a66f6dd0aaf17b76db91 (patch) | |
tree | fbdfe304c4cc5e2ce61511c9a151417068defc4d /OpenSim/Region/CoreModules/Framework/UserManagement | |
parent | minor: add doc about DefaultHGRegion and some of the other GridService region... (diff) | |
download | opensim-SC_OLD-e2b7d941b601bfeb5923a66f6dd0aaf17b76db91.zip opensim-SC_OLD-e2b7d941b601bfeb5923a66f6dd0aaf17b76db91.tar.gz opensim-SC_OLD-e2b7d941b601bfeb5923a66f6dd0aaf17b76db91.tar.bz2 opensim-SC_OLD-e2b7d941b601bfeb5923a66f6dd0aaf17b76db91.tar.xz |
Restore group membership check for HG users in QueryAccess.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/UserManagement')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index 7adb203..8c983e6 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | |||
@@ -481,14 +481,20 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
481 | 481 | ||
482 | public string GetUserUUI(UUID userID) | 482 | public string GetUserUUI(UUID userID) |
483 | { | 483 | { |
484 | UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, userID); | ||
485 | if (account != null) | ||
486 | return userID.ToString(); | ||
487 | |||
488 | UserData ud; | 484 | UserData ud; |
489 | lock (m_UserCache) | 485 | lock (m_UserCache) |
490 | m_UserCache.TryGetValue(userID, out ud); | 486 | m_UserCache.TryGetValue(userID, out ud); |
491 | 487 | ||
488 | if (ud == null) // It's not in the cache | ||
489 | { | ||
490 | string[] names = new string[2]; | ||
491 | // This will pull the data from either UserAccounts or GridUser | ||
492 | // and stick it into the cache | ||
493 | TryGetUserNamesFromServices(userID, names); | ||
494 | lock (m_UserCache) | ||
495 | m_UserCache.TryGetValue(userID, out ud); | ||
496 | } | ||
497 | |||
492 | if (ud != null) | 498 | if (ud != null) |
493 | { | 499 | { |
494 | string homeURL = ud.HomeURL; | 500 | string homeURL = ud.HomeURL; |