From 577d81270359ddc65cf263c7a0b978bdecda5e77 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Sep 2020 21:36:00 +1000 Subject: Gatekeeper -> GatekeeperURI Coz it says all over the source code - // Legacy. Remove soon! And has since later OpenSim 0.7s. One of theem even got removed upstream. --- OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs | 4 ++-- .../Framework/InventoryAccess/HGInventoryAccessModule.cs | 4 ++-- .../ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs | 2 +- .../OptionalModules/DataSnapshot/DataSnapshotManager.cs | 12 ++++++------ .../ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs index 8aab90a..a549cbc 100644 --- a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs @@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure m_ThisGridURL = Util.GetConfigVarFromSections(config, "GatekeeperURI", new string[] { "Startup", "Hypergrid", "Messaging" }, String.Empty); // Legacy. Remove soon! - m_ThisGridURL = config.Configs["Messaging"].GetString("Gatekeeper", m_ThisGridURL); +//// m_ThisGridURL = config.Configs["Messaging"].GetString("Gatekeeper", m_ThisGridURL); m_log.DebugFormat("[LURE MODULE]: {0} enabled", Name); } } @@ -274,4 +274,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure } } } -} \ No newline at end of file +} diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs index ae0fa59..af5a0f5 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs @@ -103,8 +103,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess new string[] { "Startup", "Hypergrid", "HGInventoryAccessModule" }, String.Empty); m_ThisGatekeeper = Util.GetConfigVarFromSections(source, "GatekeeperURI", new string[] { "Startup", "Hypergrid", "HGInventoryAccessModule" }, String.Empty); - // Legacy. Renove soon! - m_ThisGatekeeper = thisModuleConfig.GetString("Gatekeeper", m_ThisGatekeeper); + // Legacy. Remove soon! +//// m_ThisGatekeeper = thisModuleConfig.GetString("Gatekeeper", m_ThisGatekeeper); m_OutboundPermission = thisModuleConfig.GetBoolean("OutboundPermission", true); m_RestrictInventoryAccessAbroad = thisModuleConfig.GetBoolean("RestrictInventoryAccessAbroad", true); diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs index d31c7ad..32af1f8 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs @@ -131,7 +131,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid m_ThisGatekeeperURI = Util.GetConfigVarFromSections(source, "GatekeeperURI", new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty); // Legacy. Remove soon! - m_ThisGatekeeperURI = gridConfig.GetString("Gatekeeper", m_ThisGatekeeperURI); +//// m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", m_ThisGatekeeper); Util.checkServiceURI(m_ThisGatekeeperURI, out m_ThisGatekeeperURI, out m_ThisGatekeeperHost, out m_ThisGatekeeperIP); return true; diff --git a/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs index d7e9114..d44b8af 100644 --- a/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs +++ b/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs @@ -116,12 +116,12 @@ namespace OpenSim.Region.DataSnapshot string gatekeeper = Util.GetConfigVarFromSections(config, "GatekeeperURI", new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty); // Legacy. Remove soon! - if (string.IsNullOrEmpty(gatekeeper)) - { - IConfig conf = config.Configs["GridService"]; - if (conf != null) - gatekeeper = conf.GetString("Gatekeeper", gatekeeper); - } +//// if (string.IsNullOrEmpty(gatekeeper)) +//// { +//// IConfig conf = config.Configs["GridService"]; +//// if (conf != null) +//// gatekeeper = conf.GetString("Gatekeeper", gatekeeper); +//// } if (!string.IsNullOrEmpty(gatekeeper)) m_gridinfo.Add("gatekeeperURL", gatekeeper); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 53bfa66..d268609 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -2651,8 +2651,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return gatekeeperURI; // Legacy. Remove soon! - if (config.Configs["GridService"] != null) - gatekeeperURI = config.Configs["GridService"].GetString("Gatekeeper", gatekeeperURI); +//// if (config.Configs["GridService"] != null) +//// gatekeeperURI = config.Configs["GridService"].GetString("Gatekeeper", gatekeeperURI); return gatekeeperURI; } -- cgit v1.1