From e2b7d941b601bfeb5923a66f6dd0aaf17b76db91 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 5 Sep 2013 07:44:27 -0700
Subject: Restore group membership check for HG users in QueryAccess.

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

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
 
             try
             {
-                // 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))
+                if (!AuthorizeUser(aCircuit, false, out reason))
                 {
                     //m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID);
                     return false;
-- 
cgit v1.1