diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index cb12d65..054e17b 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -5739,9 +5739,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
5739 | 5739 | ||
5740 | try | 5740 | try |
5741 | { | 5741 | { |
5742 | if (!AuthorizeUser(aCircuit, false, out reason)) | 5742 | // If this is a hypergrid user, then we can't perform a successful groups access check here since this |
5743 | // currently relies on a circuit being present in the AuthenticateHandler to construct a Hypergrid ID. | ||
5744 | // This is only present in NewUserConnection() which entity transfer calls very soon after QueryAccess(). | ||
5745 | // Therefore, we'll defer to the check in NewUserConnection() instead. | ||
5746 | if (!AuthorizeUser(aCircuit, !UserManagementModule.IsLocalGridUser(agentID), out reason)) | ||
5743 | { | 5747 | { |
5744 | // m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID); | 5748 | //m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID); |
5745 | return false; | 5749 | return false; |
5746 | } | 5750 | } |
5747 | } | 5751 | } |