diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index cb12d65c0a..054e17bae1 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -5739,9 +5739,13 @@ namespace OpenSim.Region.Framework.Scenes try { - if (!AuthorizeUser(aCircuit, false, out reason)) + // If this is a hypergrid user, then we can't perform a successful groups access check here since this + // currently relies on a circuit being present in the AuthenticateHandler to construct a Hypergrid ID. + // This is only present in NewUserConnection() which entity transfer calls very soon after QueryAccess(). + // Therefore, we'll defer to the check in NewUserConnection() instead. + if (!AuthorizeUser(aCircuit, !UserManagementModule.IsLocalGridUser(agentID), out reason)) { - // m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID); + //m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID); return false; } }