ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 12:17:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Simian regression

Browse Source
This commit is contained in:
Melanie
2010-09-07 20:19:52 +01:00
parent 5ca4c238e0
commit b28d1b6ccd
7 changed files with 140 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
View File

@@ -73,7 +73,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
public SimianUserAccountServiceConnector(IConfigSource source)
{
Initialise(source);
CommonInit(source);
}
public void Initialise(IConfigSource source)
@@ -83,24 +83,27 @@ namespace OpenSim.Services.Connectors.SimianGrid
{
string name = moduleConfig.GetString("UserAccountServices", "");
if (name == Name)
{
IConfig gridConfig = source.Configs["UserAccountService"];
if (gridConfig != null)
{
string serviceUrl = gridConfig.GetString("UserAccountServerURI");
if (!String.IsNullOrEmpty(serviceUrl))
{
if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
serviceUrl = serviceUrl + '/';
m_serverUrl = serviceUrl;
m_Enabled = true;
}
}
CommonInit(source);
}
}
if (String.IsNullOrEmpty(m_serverUrl))
m_log.Info("[SIMIAN ACCOUNT CONNECTOR]: No UserAccountServerURI specified, disabling connector");
private void CommonInit(IConfigSource source)
{
IConfig gridConfig = source.Configs["UserAccountService"];
if (gridConfig != null)
{
string serviceUrl = gridConfig.GetString("UserAccountServerURI");
if (!String.IsNullOrEmpty(serviceUrl))
{
if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
serviceUrl = serviceUrl + '/';
m_serverUrl = serviceUrl;
m_Enabled = true;
}
}
if (String.IsNullOrEmpty(m_serverUrl))
m_log.Info("[SIMIAN ACCOUNT CONNECTOR]: No UserAccountServerURI specified, disabling connector");
}
public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)