From a4f8df246d390e9ded3723ae21db7832269daa70 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 13 Nov 2020 15:35:08 +0000 Subject: [PATCH] robust: look for grid name and nick on another section --- OpenSim/Services/GridService/GridService.cs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index a226437873..cd2ecc7369 100755 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs @@ -174,18 +174,26 @@ namespace OpenSim.Services.GridService m_ExtraFeatures["destination-guide-url"] = configVal; configVal = Util.GetConfigVarFromSections( - config, "GatekeeperURI", new string[] { "Startup", "Hypergrid" }, String.Empty); + config, "GatekeeperURI", new string[] { "Startup", "Hypergrid" }, string.Empty); if (!string.IsNullOrEmpty(configVal)) m_ExtraFeatures["GridURL"] = configVal; configVal = Util.GetConfigVarFromSections( - config, "GridName", new string[] { "Const", "Hypergrid" }, String.Empty); + config, "GridName", new string[] { "Const", "Hypergrid" }, string.Empty); if (string.IsNullOrEmpty(configVal)) configVal = Util.GetConfigVarFromSections( - config, "gridname", new string[] { "GridInfo" }, String.Empty); + config, "gridname", new string[] { "GridInfo", "GridInfoService" }, string.Empty); if (!string.IsNullOrEmpty(configVal)) m_ExtraFeatures["GridName"] = configVal; + configVal = Util.GetConfigVarFromSections( + config, "GridNick", new string[] { "Const", "Hypergrid" }, string.Empty); + if (string.IsNullOrEmpty(configVal)) + configVal = Util.GetConfigVarFromSections( + config, "gridnick", new string[] { "GridInfo", "GridInfoService" }, string.Empty); + if (!string.IsNullOrEmpty(configVal)) + m_ExtraFeatures["GridNick"] = configVal; + m_ExtraFeatures["ExportSupported"] = gridConfig.GetString("ExportSupported", "true"); string[] sections = new string[] { "Const, Startup", "Hypergrid", "GatekeeperService" };