diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs index 3c93725..9c226fb 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs | |||
@@ -88,24 +88,27 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
88 | 88 | ||
89 | public void Initialise(IConfigSource source) | 89 | public void Initialise(IConfigSource source) |
90 | { | 90 | { |
91 | IConfig gridConfig = source.Configs["UserAccountService"]; | 91 | if (Simian.IsSimianEnabled(source, "UserAccountServices")) |
92 | if (gridConfig == null) | ||
93 | { | 92 | { |
94 | m_log.Error("[PROFILES]: UserAccountService missing from OpenSim.ini"); | 93 | IConfig gridConfig = source.Configs["UserAccountService"]; |
95 | throw new Exception("Profiles init error"); | 94 | if (gridConfig == null) |
96 | } | 95 | { |
96 | m_log.Error("[PROFILES]: UserAccountService missing from OpenSim.ini"); | ||
97 | throw new Exception("Profiles init error"); | ||
98 | } | ||
97 | 99 | ||
98 | string serviceUrl = gridConfig.GetString("UserAccountServerURI"); | 100 | string serviceUrl = gridConfig.GetString("UserAccountServerURI"); |
99 | if (String.IsNullOrEmpty(serviceUrl)) | 101 | if (String.IsNullOrEmpty(serviceUrl)) |
100 | { | 102 | { |
101 | m_log.Info("[PROFILES]: No UserAccountServerURI in section UserAccountService, skipping SimianProfiles"); | 103 | m_log.Error("[PROFILES]: No UserAccountServerURI in section UserAccountService"); |
102 | return; | 104 | throw new Exception("Profiles init error"); |
103 | } | 105 | } |
104 | 106 | ||
105 | if (!serviceUrl.EndsWith("/")) | 107 | if (!serviceUrl.EndsWith("/")) |
106 | serviceUrl = serviceUrl + '/'; | 108 | serviceUrl = serviceUrl + '/'; |
107 | 109 | ||
108 | m_serverUrl = serviceUrl; | 110 | m_serverUrl = serviceUrl; |
111 | } | ||
109 | } | 112 | } |
110 | 113 | ||
111 | private void ClientConnectHandler(IClientCore clientCore) | 114 | private void ClientConnectHandler(IClientCore clientCore) |