aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/LLLoginService/LLLoginService.cs
diff options
context:
space:
mode:
authorDiva Canto2010-12-09 16:52:37 -0800
committerDiva Canto2010-12-09 16:52:37 -0800
commitcefdee8aaf365d0395b44176ff46e48e933bf1bf (patch)
tree5b884bcaefda0b83b18826ae02828d59cba14f59 /OpenSim/Services/LLLoginService/LLLoginService.cs
parentMake configs consistent, as per mantos #5258 (diff)
downloadopensim-SC-cefdee8aaf365d0395b44176ff46e48e933bf1bf.zip
opensim-SC-cefdee8aaf365d0395b44176ff46e48e933bf1bf.tar.gz
opensim-SC-cefdee8aaf365d0395b44176ff46e48e933bf1bf.tar.bz2
opensim-SC-cefdee8aaf365d0395b44176ff46e48e933bf1bf.tar.xz
Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks command. mantis #5259
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 25d80bd..281b6e3 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -772,6 +772,8 @@ namespace OpenSim.Services.LLLoginService
772 { 772 {
773 aCircuit.ServiceURLs[kvp.Key] = kvp.Value; 773 aCircuit.ServiceURLs[kvp.Key] = kvp.Value;
774 } 774 }
775 if (!aCircuit.ServiceURLs[kvp.Key].ToString().EndsWith("/"))
776 aCircuit.ServiceURLs[kvp.Key] = aCircuit.ServiceURLs[kvp.Key] + "/";
775 } 777 }
776 778
777 // New style: service keys start with SRV_; override the previous 779 // New style: service keys start with SRV_; override the previous
@@ -784,6 +786,9 @@ namespace OpenSim.Services.LLLoginService
784 { 786 {
785 string keyName = serviceKey.Replace("SRV_", ""); 787 string keyName = serviceKey.Replace("SRV_", "");
786 aCircuit.ServiceURLs[keyName] = m_LoginServerConfig.GetString(serviceKey, string.Empty); 788 aCircuit.ServiceURLs[keyName] = m_LoginServerConfig.GetString(serviceKey, string.Empty);
789 if (!aCircuit.ServiceURLs[keyName].ToString().EndsWith("/"))
790 aCircuit.ServiceURLs[keyName] = aCircuit.ServiceURLs[keyName] + "/";
791
787 m_log.DebugFormat("[LLLOGIN SERVICE]: found new key {0} {1}", keyName, aCircuit.ServiceURLs[keyName]); 792 m_log.DebugFormat("[LLLOGIN SERVICE]: found new key {0} {1}", keyName, aCircuit.ServiceURLs[keyName]);
788 } 793 }
789 } 794 }