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/Framework/Scenes/Scene.cs | |
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 '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 3eaa8fd..e00206f 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -5801,11 +5801,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
5801 | 5801 | ||
5802 | try | 5802 | try |
5803 | { | 5803 | { |
5804 | // If this is a hypergrid user, then we can't perform a successful groups access check here since this | 5804 | if (!AuthorizeUser(aCircuit, false, out reason)) |
5805 | // currently relies on a circuit being present in the AuthenticateHandler to construct a Hypergrid ID. | ||
5806 | // This is only present in NewUserConnection() which entity transfer calls very soon after QueryAccess(). | ||
5807 | // Therefore, we'll defer to the check in NewUserConnection() instead. | ||
5808 | if (!AuthorizeUser(aCircuit, !UserManagementModule.IsLocalGridUser(agentID), out reason)) | ||
5809 | { | 5805 | { |
5810 | //m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID); | 5806 | //m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID); |
5811 | return false; | 5807 | return false; |