diff options
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs index 991c0f3..446ac71 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs | |||
@@ -73,7 +73,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
73 | 73 | ||
74 | public SimianUserAccountServiceConnector(IConfigSource source) | 74 | public SimianUserAccountServiceConnector(IConfigSource source) |
75 | { | 75 | { |
76 | Initialise(source); | 76 | CommonInit(source); |
77 | } | 77 | } |
78 | 78 | ||
79 | public void Initialise(IConfigSource source) | 79 | public void Initialise(IConfigSource source) |
@@ -83,24 +83,27 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
83 | { | 83 | { |
84 | string name = moduleConfig.GetString("UserAccountServices", ""); | 84 | string name = moduleConfig.GetString("UserAccountServices", ""); |
85 | if (name == Name) | 85 | if (name == Name) |
86 | { | 86 | CommonInit(source); |
87 | IConfig gridConfig = source.Configs["UserAccountService"]; | 87 | } |
88 | if (gridConfig != null) | 88 | } |
89 | { | ||
90 | string serviceUrl = gridConfig.GetString("UserAccountServerURI"); | ||
91 | if (!String.IsNullOrEmpty(serviceUrl)) | ||
92 | { | ||
93 | if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("=")) | ||
94 | serviceUrl = serviceUrl + '/'; | ||
95 | m_serverUrl = serviceUrl; | ||
96 | m_Enabled = true; | ||
97 | } | ||
98 | } | ||
99 | 89 | ||
100 | if (String.IsNullOrEmpty(m_serverUrl)) | 90 | private void CommonInit(IConfigSource source) |
101 | m_log.Info("[SIMIAN ACCOUNT CONNECTOR]: No UserAccountServerURI specified, disabling connector"); | 91 | { |
92 | IConfig gridConfig = source.Configs["UserAccountService"]; | ||
93 | if (gridConfig != null) | ||
94 | { | ||
95 | string serviceUrl = gridConfig.GetString("UserAccountServerURI"); | ||
96 | if (!String.IsNullOrEmpty(serviceUrl)) | ||
97 | { | ||
98 | if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("=")) | ||
99 | serviceUrl = serviceUrl + '/'; | ||
100 | m_serverUrl = serviceUrl; | ||
101 | m_Enabled = true; | ||
102 | } | 102 | } |
103 | } | 103 | } |
104 | |||
105 | if (String.IsNullOrEmpty(m_serverUrl)) | ||
106 | m_log.Info("[SIMIAN ACCOUNT CONNECTOR]: No UserAccountServerURI specified, disabling connector"); | ||
104 | } | 107 | } |
105 | 108 | ||
106 | public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName) | 109 | public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName) |