diff options
author | Melanie | 2010-12-12 01:20:46 +0000 |
---|---|---|
committer | Melanie | 2010-12-12 01:20:46 +0000 |
commit | 8aa63093b118f257eff87c003e668249c34f5162 (patch) | |
tree | a5ea5448482d899729c29079ed0dab8394bb9be4 /OpenSim/Services/LLLoginService | |
parent | Fix border fence for physicals. Fix llRotLookAt() for Vehicles. (diff) | |
parent | Revert "Another stab at mantis #5256" (diff) | |
download | opensim-SC_OLD-8aa63093b118f257eff87c003e668249c34f5162.zip opensim-SC_OLD-8aa63093b118f257eff87c003e668249c34f5162.tar.gz opensim-SC_OLD-8aa63093b118f257eff87c003e668249c34f5162.tar.bz2 opensim-SC_OLD-8aa63093b118f257eff87c003e668249c34f5162.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/LLLoginService')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 1749836..93e4a8f 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -779,6 +779,8 @@ namespace OpenSim.Services.LLLoginService | |||
779 | { | 779 | { |
780 | aCircuit.ServiceURLs[kvp.Key] = kvp.Value; | 780 | aCircuit.ServiceURLs[kvp.Key] = kvp.Value; |
781 | } | 781 | } |
782 | if (!aCircuit.ServiceURLs[kvp.Key].ToString().EndsWith("/")) | ||
783 | aCircuit.ServiceURLs[kvp.Key] = aCircuit.ServiceURLs[kvp.Key] + "/"; | ||
782 | } | 784 | } |
783 | 785 | ||
784 | // New style: service keys start with SRV_; override the previous | 786 | // New style: service keys start with SRV_; override the previous |
@@ -791,6 +793,9 @@ namespace OpenSim.Services.LLLoginService | |||
791 | { | 793 | { |
792 | string keyName = serviceKey.Replace("SRV_", ""); | 794 | string keyName = serviceKey.Replace("SRV_", ""); |
793 | aCircuit.ServiceURLs[keyName] = m_LoginServerConfig.GetString(serviceKey, string.Empty); | 795 | aCircuit.ServiceURLs[keyName] = m_LoginServerConfig.GetString(serviceKey, string.Empty); |
796 | if (!aCircuit.ServiceURLs[keyName].ToString().EndsWith("/")) | ||
797 | aCircuit.ServiceURLs[keyName] = aCircuit.ServiceURLs[keyName] + "/"; | ||
798 | |||
794 | m_log.DebugFormat("[LLLOGIN SERVICE]: found new key {0} {1}", keyName, aCircuit.ServiceURLs[keyName]); | 799 | m_log.DebugFormat("[LLLOGIN SERVICE]: found new key {0} {1}", keyName, aCircuit.ServiceURLs[keyName]); |
795 | } | 800 | } |
796 | } | 801 | } |