diff options
Merge branch 'master' into presence-refactor
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
Diffstat (limited to 'OpenSim/Services/Connectors/Authorization')
-rw-r--r-- | OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs b/OpenSim/Services/Connectors/Authorization/AuthorizationServiceConnector.cs index a1c032e..4eb4bd2 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.Info("[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 | ||
@@ -86,6 +86,7 @@ namespace OpenSim.Services.Connectors | |||
86 | bool responseOnFailure = authorizationConfig.GetBoolean("ResponseOnFailure",true); | 86 | bool responseOnFailure = authorizationConfig.GetBoolean("ResponseOnFailure",true); |
87 | 87 | ||
88 | m_ResponseOnFailure = responseOnFailure; | 88 | m_ResponseOnFailure = responseOnFailure; |
89 | m_log.Info("[AUTHORIZATION CONNECTOR]: AuthorizationService initialized"); | ||
89 | } | 90 | } |
90 | 91 | ||
91 | public bool IsAuthorizedForRegion(string userID, string firstname, string surname, string email, string regionName, string regionID, out string message) | 92 | public bool IsAuthorizedForRegion(string userID, string firstname, string surname, string email, string regionName, string regionID, out string message) |