Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim

1 files changed, 30 insertions, 1 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 5e27eff..d95d9d3 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -134,6 +134,7 @@ namespace OpenSim.Region.Framework.Scenes
         public IXfer XferManager;
 
         protected IAssetService m_AssetService = null;
+        protected IAuthorizationService m_AuthorizationService = null;
 
         public IAssetService AssetService
         {
@@ -152,6 +153,25 @@ namespace OpenSim.Region.Framework.Scenes
                 return m_AssetService;
             }
         }
+        
+        public IAuthorizationService AuthorizationService
+        {
+            get
+            {
+                if (m_AuthorizationService == null)
+                {
+                    m_AuthorizationService = RequestModuleInterface<IAuthorizationService>();
+
+                    if (m_AuthorizationService == null)
+                    {
+                        // don't throw an exception if no authorization service is set for the time being
+                         m_log.InfoFormat("[SCENE]: No Authorization service is configured");
+                    }
+                }
+
+                return m_AuthorizationService;
+            }
+        }
 
         protected IInventoryService m_InventoryService = null;
 
@@ -3230,7 +3250,16 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (!m_strictAccessControl) return true;
             if (Permissions.IsGod(agent.AgentID)) return true;
-
+                      
+            if (AuthorizationService != null)
+            {
+                                if(!AuthorizationService.IsAuthorizedForRegion(agent.AgentID.ToString(), RegionInfo.RegionID.ToString()))
+                                {
+                                        m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the region",
+                                        agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName);
+                                        return false;   
+                                }
+            }
 
             if (m_regInfo.EstateSettings.IsBanned(agent.AgentID))
             {