diff options
Diffstat (limited to 'OpenSim/Services/LLLoginService')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index e2d1f04..efc0568 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -761,6 +761,7 @@ namespace OpenSim.Services.LLLoginService | |||
761 | if (account.ServiceURLs == null) | 761 | if (account.ServiceURLs == null) |
762 | return; | 762 | return; |
763 | 763 | ||
764 | // Old style: get the service keys from the DB | ||
764 | foreach (KeyValuePair<string, object> kvp in account.ServiceURLs) | 765 | foreach (KeyValuePair<string, object> kvp in account.ServiceURLs) |
765 | { | 766 | { |
766 | if (kvp.Value == null || (kvp.Value != null && kvp.Value.ToString() == string.Empty)) | 767 | if (kvp.Value == null || (kvp.Value != null && kvp.Value.ToString() == string.Empty)) |
@@ -772,6 +773,21 @@ namespace OpenSim.Services.LLLoginService | |||
772 | aCircuit.ServiceURLs[kvp.Key] = kvp.Value; | 773 | aCircuit.ServiceURLs[kvp.Key] = kvp.Value; |
773 | } | 774 | } |
774 | } | 775 | } |
776 | |||
777 | // New style: service keys start with SRV_; override the previous | ||
778 | string[] keys = m_LoginServerConfig.GetKeys(); | ||
779 | |||
780 | if (keys.Length > 0) | ||
781 | { | ||
782 | IEnumerable<string> serviceKeys = keys.Where(value => value.StartsWith("SRV_")); | ||
783 | foreach (string serviceKey in serviceKeys) | ||
784 | { | ||
785 | string keyName = serviceKey.Replace("SRV_", ""); | ||
786 | aCircuit.ServiceURLs[keyName] = m_LoginServerConfig.GetString(serviceKey, string.Empty); | ||
787 | m_log.DebugFormat("[LLLOGIN SERVICE]: found new key {0} {1}", keyName, aCircuit.ServiceURLs[keyName]); | ||
788 | } | ||
789 | } | ||
790 | |||
775 | } | 791 | } |
776 | 792 | ||
777 | private bool LaunchAgentDirectly(ISimulationService simConnector, GridRegion region, AgentCircuitData aCircuit, out string reason) | 793 | private bool LaunchAgentDirectly(ISimulationService simConnector, GridRegion region, AgentCircuitData aCircuit, out string reason) |