diff options
author | Diva Canto | 2010-12-09 16:52:37 -0800 |
---|---|---|
committer | Diva Canto | 2010-12-09 16:52:37 -0800 |
commit | cefdee8aaf365d0395b44176ff46e48e933bf1bf (patch) | |
tree | 5b884bcaefda0b83b18826ae02828d59cba14f59 /OpenSim/Services | |
parent | Make configs consistent, as per mantos #5258 (diff) | |
download | opensim-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 'OpenSim/Services')
4 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs index 0c41935..7ddcfa6 100644 --- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | |||
@@ -104,7 +104,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
104 | return false; | 104 | return false; |
105 | } | 105 | } |
106 | 106 | ||
107 | string uri = m_ServerURL + "/homeagent/" + aCircuit.AgentID + "/"; | 107 | string uri = m_ServerURL + "homeagent/" + aCircuit.AgentID + "/"; |
108 | 108 | ||
109 | Console.WriteLine(" >>> LoginAgentToGrid <<< " + uri); | 109 | Console.WriteLine(" >>> LoginAgentToGrid <<< " + uri); |
110 | 110 | ||
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index e2032d9..4e3cfa5 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -235,6 +235,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
235 | m_log.Warn("[REMOTE SIMULATION CONNECTOR]: PackAgentCircuitData failed with exception: " + e.Message); | 235 | m_log.Warn("[REMOTE SIMULATION CONNECTOR]: PackAgentCircuitData failed with exception: " + e.Message); |
236 | return null; | 236 | return null; |
237 | } | 237 | } |
238 | |||
238 | // Add the input arguments | 239 | // Add the input arguments |
239 | args["destination_x"] = OSD.FromString(destination.RegionLocX.ToString()); | 240 | args["destination_x"] = OSD.FromString(destination.RegionLocX.ToString()); |
240 | args["destination_y"] = OSD.FromString(destination.RegionLocY.ToString()); | 241 | args["destination_y"] = OSD.FromString(destination.RegionLocY.ToString()); |
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index 2184498..31c7b80 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
@@ -433,7 +433,7 @@ namespace OpenSim.Services.GridService | |||
433 | MainConsole.Instance.Output(String.Format("{0,-39} {1}\n{2,-39} {3}\n", | 433 | MainConsole.Instance.Output(String.Format("{0,-39} {1}\n{2,-39} {3}\n", |
434 | r.RegionName, r.RegionID, | 434 | r.RegionName, r.RegionID, |
435 | String.Format("{0},{1} ({2},{3})", r.posX, r.posY, r.posX / 256, r.posY / 256), | 435 | String.Format("{0},{1} ({2},{3})", r.posX, r.posY, r.posX / 256, r.posY / 256), |
436 | "http://" + r.Data["serverIP"].ToString() + ":" + r.Data["serverHttpPort"].ToString())); | 436 | r.Data["serverURI"].ToString())); |
437 | } | 437 | } |
438 | return; | 438 | return; |
439 | } | 439 | } |
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 | } |