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

Merge branch 'master-core' into mantis5110

Browse Source
This commit is contained in:
Jonathan Freedman
2010-12-05 11:49:15 -08:00
parent bc51dfc45e 6639aaeed4
commit 45cd2e3ef9
79 changed files with 2421 additions and 1169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@@ -761,6 +761,7 @@ namespace OpenSim.Services.LLLoginService
if (account.ServiceURLs == null)
return;
// Old style: get the service keys from the DB
foreach (KeyValuePair<string, object> kvp in account.ServiceURLs)
{
if (kvp.Value == null || (kvp.Value != null && kvp.Value.ToString() == string.Empty))
@@ -772,6 +773,21 @@ namespace OpenSim.Services.LLLoginService
aCircuit.ServiceURLs[kvp.Key] = kvp.Value;
}
}
// New style: service keys start with SRV_; override the previous
string[] keys = m_LoginServerConfig.GetKeys();
if (keys.Length > 0)
{
IEnumerable<string> serviceKeys = keys.Where(value => value.StartsWith("SRV_"));
foreach (string serviceKey in serviceKeys)
{
string keyName = serviceKey.Replace("SRV_", "");
aCircuit.ServiceURLs[keyName] = m_LoginServerConfig.GetString(serviceKey, string.Empty);
m_log.DebugFormat("[LLLOGIN SERVICE]: found new key {0} {1}", keyName, aCircuit.ServiceURLs[keyName]);
}
}
}
private bool LaunchAgentDirectly(ISimulationService simConnector, GridRegion region, AgentCircuitData aCircuit, out string reason)