From daa9866a9adf591c6b32f992d189f6a1189a1677 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 13 Jan 2010 19:25:33 -0800
Subject: Omit AuthorizationService from the default configurations, because
 the service doesn't exist in the distribution.

---
 OpenSim/Region/Framework/Scenes/Scene.cs   | 10 +++++-----
 bin/config-include/Grid.ini                |  1 -
 bin/config-include/GridHypergrid.ini       |  1 -
 bin/config-include/StandaloneHypergrid.ini |  1 -
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 206e2f8..ecbd7e3 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -187,11 +187,11 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     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");
-                    }
+                    //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;
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 6bf493b..27e5cfb 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -13,7 +13,6 @@
     GridServices = "RemoteGridServicesConnector"
     NeighbourServices = "RemoteNeighbourServicesConnector"
     AuthenticationServices = "RemoteAuthenticationServicesConnector"
-    AuthorizationServices = "RemoteAuthorizationServicesConnector"
     PresenceServices = "RemotePresenceServicesConnector"
     UserAccountServices = "RemoteUserAccountServicesConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 1a68362..3089598 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -16,7 +16,6 @@
     GridServices = "HGGridServicesConnector"
     NeighbourServices = "RemoteNeighbourServicesConnector"
     AuthenticationServices = "RemoteAuthenticationServicesConnector"
-    AuthorizationServices = "LocalAuthorizationServicesConnector"
     PresenceServices = "RemotePresenceServicesConnector"
     UserAccountServices = "RemoteUserAccountServicesConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index a3e0547..682170c 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -15,7 +15,6 @@
     InventoryServices = "HGInventoryBroker"
     NeighbourServices = "RemoteNeighbourServicesConnector"
     AuthenticationServices = "LocalAuthenticationServicesConnector"
-    AuthorizationServices = "LocalAuthorizationServicesConnector"
     GridServices = "HGGridServicesConnector"
     PresenceServices = "LocalPresenceServicesConnector"
     UserAccountServices = "LocalUserAccountServicesConnector"
-- 
cgit v1.1