From 77737c81234c98d72bffaa6ddca374504f971b12 Mon Sep 17 00:00:00 2001 From: onefang Date: Thu, 25 Jul 2019 20:19:51 +1000 Subject: Gatekeeper -> GatekeeperURI Coz it says all over the source code - // Legacy. Remove soon! And has since later OpenSim 0.7s. --- OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs | 5 ++--- .../Framework/InventoryAccess/HGInventoryAccessModule.cs | 2 +- .../ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs | 2 +- .../OptionalModules/DataSnapshot/DataSnapshotManager.cs | 12 ++++++------ .../ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 4 ++-- OpenSim/Services/GridService/HypergridLinker.cs | 2 +- bin/config-include/GridCommon.ini | 6 +++--- bin/config-include/GridCommon.ini.example | 6 +++--- bin/config-include/StandaloneCommon.ini | 2 +- bin/config-include/StandaloneCommon.ini.example | 2 +- 10 files changed, 21 insertions(+), 22 deletions(-) diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs index 381bb4d..dfcf925 100644 --- a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs @@ -65,11 +65,10 @@ 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_log.DebugFormat("[LURE MODULE]: {0} enabled", Name); } + // Legacy. Remove soon! +//// m_ThisGridURL = config.Configs["Messaging"].GetString("Gatekeeper", m_ThisGridURL); } } diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs index 8ebd999..8f6eca6 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs @@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess m_ThisGatekeeper = Util.GetConfigVarFromSections(source, "GatekeeperURI", new string[] { "Startup", "Hypergrid", "HGInventoryAccessModule" }, String.Empty); // Legacy. Remove soon! - m_ThisGatekeeper = thisModuleConfig.GetString("Gatekeeper", m_ThisGatekeeper); +//// 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 ee17093..0efe99d 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs @@ -129,7 +129,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid m_ThisGatekeeper = Util.GetConfigVarFromSections(source, "GatekeeperURI", new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty); // Legacy. Remove soon! - m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", m_ThisGatekeeper); +//// m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", m_ThisGatekeeper); Util.checkServiceURI(m_ThisGatekeeper, out m_ThisGatekeeper); diff --git a/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs index 0436f96..39e731f 100644 --- a/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs +++ b/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs @@ -114,12 +114,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 2be5200..64da67e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -2493,8 +2493,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; } diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index 4887232..7c384d5 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs @@ -125,7 +125,7 @@ namespace OpenSim.Services.GridService m_ThisGatekeeper = Util.GetConfigVarFromSections(config, "GatekeeperURI", new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty); // Legacy. Remove soon! - m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", m_ThisGatekeeper); +//// m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", m_ThisGatekeeper); try { m_ThisGatekeeperURI = new Uri(m_ThisGatekeeper); diff --git a/bin/config-include/GridCommon.ini b/bin/config-include/GridCommon.ini index 8621651..394fa18 100644 --- a/bin/config-include/GridCommon.ini +++ b/bin/config-include/GridCommon.ini @@ -113,7 +113,7 @@ ;; Change this to the address of your Gatekeeper service ;; (usually bundled with the rest of the services in one ;; Robust server in port ${Const|PublicPort}, but not always) - Gatekeeper="${Const|GridURL}:${Const|PublicPort}" + GatekeeperURI="${Const|GridURL}:${Const|PublicPort}" [EstateDataStore] ; @@ -130,7 +130,7 @@ ;; Change this to the address of your Gatekeeper service ;; (usually bundled with the rest of the services in one ;; Robust server in port ${Const|PublicPort}, but not always) - Gatekeeper = "${Const|GridURL}:${Const|PublicPort}" + GatekeeperURI = "${Const|GridURL}:${Const|PublicPort}" [AvatarService] ; @@ -181,7 +181,7 @@ ; accessible from other grids ; HomeURI = "${Const|GridURL}:${Const|PublicPort}" - Gatekeeper = "${Const|GridURL}:${Const|PublicPort}" + GatekeeperURI = "${Const|GridURL}:${Const|PublicPort}" ;; If you want to protect your assets from being copied by foreign visitors ;; set this to false. You may want to do this on sims that have licensed content. ;; Default is true. diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index 5406295..47771e3 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example @@ -110,7 +110,7 @@ ;; Change this to the address of your Gatekeeper service ;; (usually bundled with the rest of the services in one ;; Robust server in port ${Const|PublicPort}, but not always) - Gatekeeper="${Const|BaseURL}:${Const|PublicPort}" + GatekeeperURI="${Const|BaseURL}:${Const|PublicPort}" [EstateDataStore] ; @@ -127,7 +127,7 @@ ;; Change this to the address of your Gatekeeper service ;; (usually bundled with the rest of the services in one ;; Robust server in port ${Const|PublicPort}, but not always) - Gatekeeper = "${Const|BaseURL}:${Const|PublicPort}" + GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}" [AvatarService] ; @@ -178,7 +178,7 @@ ; accessible from other grids ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}" - Gatekeeper = "${Const|BaseURL}:${Const|PublicPort}" + GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}" ;; If you want to protect your assets from being copied by foreign visitors ;; set this to false. You may want to do this on sims that have licensed content. ;; Default is true. diff --git a/bin/config-include/StandaloneCommon.ini b/bin/config-include/StandaloneCommon.ini index 1db62c8..8da7784 100644 --- a/bin/config-include/StandaloneCommon.ini +++ b/bin/config-include/StandaloneCommon.ini @@ -121,7 +121,7 @@ [LoginService] WelcomeMessage = "Welcome, Avatar!" - ;; If you have Gatekeeper set under [Hypergrid], no need to set it here, leave it commented + ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}" SRV_HomeURI = "${Const|BaseURL}:${Const|PublicPort}" diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 53f0da2..941a2ee 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -121,7 +121,7 @@ [LoginService] WelcomeMessage = "Welcome, Avatar!" - ;; If you have Gatekeeper set under [Hypergrid], no need to set it here, leave it commented + ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}" SRV_HomeURI = "${Const|BaseURL}:${Const|PublicPort}" -- cgit v1.1