aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-01-13 19:25:33 -0800
committerDiva Canto2010-01-13 19:25:33 -0800
commitdaa9866a9adf591c6b32f992d189f6a1189a1677 (patch)
treee8e5143e8076b55f4594bd6f6b532e5d9f6411c4
parentMake use of Fallback regions when the desired start region is having problems. (diff)
downloadopensim-SC_OLD-daa9866a9adf591c6b32f992d189f6a1189a1677.zip
opensim-SC_OLD-daa9866a9adf591c6b32f992d189f6a1189a1677.tar.gz
opensim-SC_OLD-daa9866a9adf591c6b32f992d189f6a1189a1677.tar.bz2
opensim-SC_OLD-daa9866a9adf591c6b32f992d189f6a1189a1677.tar.xz
Omit AuthorizationService from the default configurations, because the service doesn't exist in the distribution.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs10
-rw-r--r--bin/config-include/Grid.ini1
-rw-r--r--bin/config-include/GridHypergrid.ini1
-rw-r--r--bin/config-include/StandaloneHypergrid.ini1
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
187 { 187 {
188 m_AuthorizationService = RequestModuleInterface<IAuthorizationService>(); 188 m_AuthorizationService = RequestModuleInterface<IAuthorizationService>();
189 189
190 if (m_AuthorizationService == null) 190 //if (m_AuthorizationService == null)
191 { 191 //{
192 // don't throw an exception if no authorization service is set for the time being 192 // // don't throw an exception if no authorization service is set for the time being
193 m_log.InfoFormat("[SCENE]: No Authorization service is configured"); 193 // m_log.InfoFormat("[SCENE]: No Authorization service is configured");
194 } 194 //}
195 } 195 }
196 196
197 return m_AuthorizationService; 197 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 @@
13 GridServices = "RemoteGridServicesConnector" 13 GridServices = "RemoteGridServicesConnector"
14 NeighbourServices = "RemoteNeighbourServicesConnector" 14 NeighbourServices = "RemoteNeighbourServicesConnector"
15 AuthenticationServices = "RemoteAuthenticationServicesConnector" 15 AuthenticationServices = "RemoteAuthenticationServicesConnector"
16 AuthorizationServices = "RemoteAuthorizationServicesConnector"
17 PresenceServices = "RemotePresenceServicesConnector" 16 PresenceServices = "RemotePresenceServicesConnector"
18 UserAccountServices = "RemoteUserAccountServicesConnector" 17 UserAccountServices = "RemoteUserAccountServicesConnector"
19 SimulationServices = "RemoteSimulationConnectorModule" 18 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 @@
16 GridServices = "HGGridServicesConnector" 16 GridServices = "HGGridServicesConnector"
17 NeighbourServices = "RemoteNeighbourServicesConnector" 17 NeighbourServices = "RemoteNeighbourServicesConnector"
18 AuthenticationServices = "RemoteAuthenticationServicesConnector" 18 AuthenticationServices = "RemoteAuthenticationServicesConnector"
19 AuthorizationServices = "LocalAuthorizationServicesConnector"
20 PresenceServices = "RemotePresenceServicesConnector" 19 PresenceServices = "RemotePresenceServicesConnector"
21 UserAccountServices = "RemoteUserAccountServicesConnector" 20 UserAccountServices = "RemoteUserAccountServicesConnector"
22 SimulationServices = "RemoteSimulationConnectorModule" 21 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 @@
15 InventoryServices = "HGInventoryBroker" 15 InventoryServices = "HGInventoryBroker"
16 NeighbourServices = "RemoteNeighbourServicesConnector" 16 NeighbourServices = "RemoteNeighbourServicesConnector"
17 AuthenticationServices = "LocalAuthenticationServicesConnector" 17 AuthenticationServices = "LocalAuthenticationServicesConnector"
18 AuthorizationServices = "LocalAuthorizationServicesConnector"
19 GridServices = "HGGridServicesConnector" 18 GridServices = "HGGridServicesConnector"
20 PresenceServices = "LocalPresenceServicesConnector" 19 PresenceServices = "LocalPresenceServicesConnector"
21 UserAccountServices = "LocalUserAccountServicesConnector" 20 UserAccountServices = "LocalUserAccountServicesConnector"