Another attempt at sorting out the auto group chicken and egg problems.

Are you a local?  Asking for a friend.

1 files changed, 17 insertions, 7 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index ba08aab..fcfa448 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4351,6 +4351,7 @@ namespace OpenSim.Region.Framework.Scenes
         protected virtual bool AuthorizeUser(AgentCircuitData agent, bool bypassAccessControl, out string reason)
         {
             reason = String.Empty;
+            bool isLocal = false;
 
             if (!m_strictAccessControl)
                 return true;
@@ -4360,7 +4361,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (AuthorizationService != null)
             {
                 if (!AuthorizationService.IsAuthorizedForRegion(
-                    agent.AgentID.ToString(), agent.firstname, agent.lastname, RegionInfo.RegionID.ToString(), out reason))
+                    agent.AgentID.ToString(), agent.firstname, agent.lastname, RegionInfo.RegionID.ToString(), out reason, out isLocal))
                 {
                     m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because: {4}",
                                      agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName, reason);
@@ -4403,15 +4404,24 @@ namespace OpenSim.Region.Framework.Scenes
                     for(int i = 0;i < GroupMembership.Length;i++)
                         agentGroups.Add(GroupMembership[i].GroupID);
                     // We get called twice, the first time the name is set to a single space.
+                    // The first time is from QueryAccess(), the second from NewUserConnection()
 //                  if (" " != agent.Name)
                     {
-                        string grid = "local";
-                        // agent.AgentID could look like this - @grid.com:8002 01234567-89ab-cdef-0123-456789abcdef
-                        string a = agent.AgentID.ToString();
-                        if ("@" == a.Substring(0, 1))
+                        string grid = "";
+                        if (isLocal)
                         {
-                            grid = a.Split(':')[0].Substring(1);
-                            m_log.InfoFormat("[CONNECTION BEGIN]: HYPERGRID agent {0} from grid {1}, checking auto groups.", agent.AgentID, grid);
+                            grid = "local";
+                            m_log.InfoFormat("[CONNECTION BEGIN]: LOCAL agent {0}, checking auto groups.", agent.AgentID);
+                        }
+                        else
+                        {
+                            // agent.AgentID could look like this - @grid.com:8002 01234567-89ab-cdef-0123-456789abcdef
+                            string a = agent.AgentID.ToString();
+                            if ("@" == a.Substring(0, 1))
+                            {
+                                grid = a.Split(':')[0].Substring(1);
+                                m_log.InfoFormat("[CONNECTION BEGIN]: HYPERGRID agent {0} from grid {1}, checking auto groups.", agent.AgentID, grid);
+                            }
                         }
                         string[] groupIDs = null;
                         try