aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorMelanie2009-12-07 14:14:00 +0000
committerMelanie2009-12-07 14:14:00 +0000
commit9155c9ee3742ff3d79554779b32a8fe1b19aaaf3 (patch)
tree23fd52b8cd3bd0e1caafa52dc393111cd762e93a /OpenSim/Services
parentMerge branch 'careminster' of ssh://TOR/home/kitto/opensim/ into careminster (diff)
parentStop AuthorizationService from throwing an error if it's not configured. (diff)
downloadopensim-SC_OLD-9155c9ee3742ff3d79554779b32a8fe1b19aaaf3.zip
opensim-SC_OLD-9155c9ee3742ff3d79554779b32a8fe1b19aaaf3.tar.gz
opensim-SC_OLD-9155c9ee3742ff3d79554779b32a8fe1b19aaaf3.tar.bz2
opensim-SC_OLD-9155c9ee3742ff3d79554779b32a8fe1b19aaaf3.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs b/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
index c2ad9db..a1c032e 100644
--- a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Services.Connectors
67 IConfig authorizationConfig = source.Configs["AuthorizationService"]; 67 IConfig authorizationConfig = source.Configs["AuthorizationService"];
68 if (authorizationConfig == null) 68 if (authorizationConfig == null)
69 { 69 {
70 m_log.Error("[AUTHORIZATION CONNECTOR]: AuthorizationService missing from OpenSim.ini"); 70 m_log.Info("[AUTHORIZATION CONNECTOR]: AuthorizationService missing from OpenSim.ini");
71 throw new Exception("Authorization connector init error"); 71 throw new Exception("Authorization connector init error");
72 } 72 }
73 73