From 28f5bfeb2023e7738f278004ef648bda05fce0df Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 21 Nov 2020 23:47:41 +0000 Subject: [PATCH] mantis 8816: missed a few spots --- OpenSim/Framework/GridInfo.cs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/OpenSim/Framework/GridInfo.cs b/OpenSim/Framework/GridInfo.cs index 93beab872d..6a7077c9ca 100644 --- a/OpenSim/Framework/GridInfo.cs +++ b/OpenSim/Framework/GridInfo.cs @@ -80,10 +80,7 @@ namespace OpenSim.Framework Port = m_checkuri.Port; Path = m_checkuri.AbsolutePath; URL = m_checkuri.Scheme + "://" + Host + ":" + Port; - //if (Path == "/") - // URI = URL; - //else - URI = URL + Path; + URI = m_checkuri.AbsoluteUri; if (withDNSResolve) { @@ -480,7 +477,7 @@ namespace OpenSim.Framework m_log.Error(tmpuri.IsValidHost ? "Could not resolve SearchServerURI" : "SearchServerURI is a invalid host"); throw new Exception("SearchServerURI configuration error"); } - m_SearchURL = tmpuri.URIwEndSlash; + m_SearchURL = tmpuri.URI; } m_DestinationGuideURL = Util.GetConfigVarFromSections(config, "DestinationGuideURI",namessections, string.Empty); @@ -496,7 +493,7 @@ namespace OpenSim.Framework m_log.Error(tmpuri.IsValidHost ? "Could not resolve DestinationGuideURL" : "DestinationGuideURL is a invalid host"); throw new Exception("DestinationGuideURL configuration error"); } - m_DestinationGuideURL = tmpuri.URIwEndSlash; + m_DestinationGuideURL = tmpuri.URI; } m_economyURL = Util.GetConfigVarFromSections(config, "economy", new string[] { "Economy", "GridInfo" }); @@ -508,7 +505,7 @@ namespace OpenSim.Framework m_log.Error(tmpuri.IsValidHost ? "Could not resolve economyURL" : "economyURL is a invalid host"); throw new Exception("economyURL configuration error"); } - m_economyURL = tmpuri.URIwEndSlash; + m_economyURL = tmpuri.URI; } }