1 files changed, 7 insertions, 4 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/AuthorizationService.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/AuthorizationService.cs
index 93dff1f..c910422 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/AuthorizationService.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/AuthorizationService.cs
@@ -69,7 +69,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
 
             if (config != null)
             {
-                string accessStr = config.GetString("Region_" + scene.RegionInfo.RegionName.Replace(' ', '_'), String.Empty);
+                string defaultAccess = config.GetString("DefaultRegionAccess", "None");
+                string accessStr = config.GetString("Region_" + scene.RegionInfo.RegionName.Replace(' ', '_'), defaultAccess);
                 if (accessStr != string.Empty)
                 {
                     try
@@ -87,8 +88,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
         }
 
         public bool IsAuthorizedForRegion(
-            string user, string firstName, string lastName, string regionID, out string message)
+            string user, string firstName, string lastName, string regionID, out string message, out bool isLocal)
         {
+            UUID userID = new UUID(user);
+            isLocal = m_UserManagement.IsLocalGridUser(userID);
+
             // This should not happen
             if (m_Scene.RegionInfo.RegionID.ToString() != regionID)
             {
@@ -104,11 +108,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
                 return true;
             }
 
-            UUID userID = new UUID(user);
 
             if ((m_accessValue & AccessFlags.DisallowForeigners) != 0)
             {
-                if (!m_UserManagement.IsLocalGridUser(userID))
+                if (!isLocal)
                 {
                     message = "No foreign users allowed in this region";
                     return false;