From 041594ed075049f804fc157700a6d78e54194c0b Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 31 Jan 2010 13:01:23 -0800 Subject: Cleaned up configuration. 'gridmode' and 'hypergrid' are gone, as well as lots of other obsolete configs. --- OpenSim/Framework/ConfigSettings.cs | 9 --------- OpenSim/Framework/NetworkServersInfo.cs | 17 ----------------- OpenSim/Region/Application/Application.cs | 1 - OpenSim/Region/Application/ConfigurationLoader.cs | 14 -------------- OpenSim/Region/Application/OpenSim.cs | 13 +------------ .../Asset/AssetServiceInConnectorModule.cs | 5 ----- .../Grid/GridInfoServiceInConnectorModule.cs | 4 ---- .../Hypergrid/HypergridServiceInConnectorModule.cs | 4 ---- .../Inventory/InventoryServiceInConnectorModule.cs | 4 ---- OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 18 +++--------------- .../World/MoneyModule/SampleMoneyModule.cs | 15 +-------------- 11 files changed, 5 insertions(+), 99 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs index 32415e0..8feaa37 100644 --- a/OpenSim/Framework/ConfigSettings.cs +++ b/OpenSim/Framework/ConfigSettings.cs @@ -44,14 +44,6 @@ namespace OpenSim.Framework set { m_meshEngineName = value; } } - private bool m_standalone; - - public bool Standalone - { - get { return m_standalone; } - set { m_standalone = value; } - } - private bool m_see_into_region_from_neighbor; public bool See_into_region_from_neighbor @@ -163,7 +155,6 @@ namespace OpenSim.Framework public const uint DefaultAssetServerHttpPort = 8003; public const uint DefaultRegionHttpPort = 9000; - public static uint DefaultRegionRemotingPort = 8895; // This is actually assigned to, but then again, the remoting is obsolete, right? public const uint DefaultUserServerHttpPort = 8002; public const bool DefaultUserServerHttpSSL = false; public const uint DefaultMessageServerHttpPort = 8006; diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs index f720222..b25f8b9 100644 --- a/OpenSim/Framework/NetworkServersInfo.cs +++ b/OpenSim/Framework/NetworkServersInfo.cs @@ -42,8 +42,6 @@ namespace OpenSim.Framework public string InventoryURL = String.Empty; public bool secureInventoryServer = false; public bool isSandbox; - private uint? m_defaultHomeLocX; - private uint? m_defaultHomeLocY; public string UserRecvKey = String.Empty; public string UserSendKey = String.Empty; public string UserURL = String.Empty; @@ -59,24 +57,11 @@ namespace OpenSim.Framework public NetworkServersInfo(uint defaultHomeLocX, uint defaultHomeLocY) { - m_defaultHomeLocX = defaultHomeLocX; - m_defaultHomeLocY = defaultHomeLocY; } - public uint DefaultHomeLocX - { - get { return m_defaultHomeLocX.Value; } - } - - public uint DefaultHomeLocY - { - get { return m_defaultHomeLocY.Value; } - } public void loadFromConfiguration(IConfigSource config) { - m_defaultHomeLocX = (uint) config.Configs["StandAlone"].GetInt("default_location_x", 1000); - m_defaultHomeLocY = (uint) config.Configs["StandAlone"].GetInt("default_location_y", 1000); HttpListenerPort = (uint) config.Configs["Network"].GetInt("http_listener_port", (int) ConfigSettings.DefaultRegionHttpPort); @@ -84,8 +69,6 @@ namespace OpenSim.Framework (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)ConfigSettings.DefaultRegionHttpPort+1)); HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false); HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "localhost"); - ConfigSettings.DefaultRegionRemotingPort = - (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) ConfigSettings.DefaultRegionRemotingPort); GridURL = config.Configs["Network"].GetString("grid_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString()); diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index 555baa4..7721cdf 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs @@ -129,7 +129,6 @@ namespace OpenSim configSource.AddSwitch("Startup", "inifile"); configSource.AddSwitch("Startup", "inimaster"); configSource.AddSwitch("Startup", "inidirectory"); - configSource.AddSwitch("Startup", "gridmode"); configSource.AddSwitch("Startup", "physics"); configSource.AddSwitch("Startup", "gui"); configSource.AddSwitch("Startup", "console"); diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index 21edcc5..655c5ca 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs @@ -304,7 +304,6 @@ namespace OpenSim config.Set("region_info_source", "filesystem"); - config.Set("gridmode", false); config.Set("physics", "OpenDynamicsEngine"); config.Set("meshing", "Meshmerizer"); config.Set("physical_prim", true); @@ -342,19 +341,7 @@ namespace OpenSim if (null == config) config = defaultConfig.AddConfig("Network"); - config.Set("default_location_x", 1000); - config.Set("default_location_y", 1000); config.Set("http_listener_port", ConfigSettings.DefaultRegionHttpPort); - config.Set("remoting_listener_port", ConfigSettings.DefaultRegionRemotingPort); - config.Set("grid_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString()); - config.Set("grid_send_key", "null"); - config.Set("grid_recv_key", "null"); - config.Set("user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString()); - config.Set("user_send_key", "null"); - config.Set("user_recv_key", "null"); - config.Set("asset_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString()); - config.Set("inventory_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultInventoryServerHttpPort.ToString()); - config.Set("secure_inventory_server", "true"); } return defaultConfig; @@ -368,7 +355,6 @@ namespace OpenSim IConfig startupConfig = m_config.Source.Configs["Startup"]; if (startupConfig != null) { - m_configSettings.Standalone = !startupConfig.GetBoolean("gridmode", false); m_configSettings.PhysicsEngine = startupConfig.GetString("physics"); m_configSettings.MeshEngineName = startupConfig.GetString("meshing"); m_configSettings.PhysicalPrim = startupConfig.GetBoolean("physical_prim", true); diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 299f519..10ff57d 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -122,8 +122,7 @@ namespace OpenSim m_log.Info("===================================================================="); m_log.Info("========================= STARTING OPENSIM ========================="); m_log.Info("===================================================================="); - m_log.InfoFormat("[OPENSIM MAIN]: Running in {0} mode", - (ConfigurationSettings.Standalone ? "sandbox" : "grid")); + m_log.InfoFormat("[OPENSIM MAIN]: Running "); //m_log.InfoFormat("[OPENSIM MAIN]: GC Is Server GC: {0}", GCSettings.IsServerGC.ToString()); // http://msdn.microsoft.com/en-us/library/bb384202.aspx //GCSettings.LatencyMode = GCLatencyMode.Batch; @@ -353,16 +352,6 @@ namespace OpenSim "kill uuid ", "Kill an object by UUID", KillUUID); - - m_console.Commands.AddCommand("hypergrid", false, "link-mapping", "link-mapping [ ] ", - "Set local coordinate to map HG regions to", RunCommand); - m_console.Commands.AddCommand("hypergrid", false, "link-region", - "link-region :[:] ", - "Link a hypergrid region", RunCommand); - m_console.Commands.AddCommand("hypergrid", false, "unlink-region", - "unlink-region or : ", - "Unlink a hypergrid region", RunCommand); - } public override void ShutdownSpecific() diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs index 879cc70..2324380 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs @@ -51,11 +51,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset public void Initialise(IConfigSource config) { - //// This module is only on for standalones in hypergrid mode - //enabled = ((!config.Configs["Startup"].GetBoolean("gridmode", true)) && - // config.Configs["Startup"].GetBoolean("hypergrid", true)) || - // ((config.Configs["MXP"] != null) && config.Configs["MXP"].GetBoolean("Enabled", true)); - //m_log.DebugFormat("[RegionAssetService]: enabled? {0}", enabled); m_Config = config; IConfig moduleConfig = config.Configs["Modules"]; if (moduleConfig != null) diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs index 7c9b752..6d975af 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs @@ -53,10 +53,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid public void Initialise(IConfigSource config) { - //// This module is only on for standalones in hypergrid mode - //enabled = (!config.Configs["Startup"].GetBoolean("gridmode", true)) && - // config.Configs["Startup"].GetBoolean("hypergrid", true); - //m_log.DebugFormat("[RegionInventoryService]: enabled? {0}", enabled); m_Config = config; IConfig moduleConfig = config.Configs["Modules"]; if (moduleConfig != null) diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs index c737f8b..c6848bb 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs @@ -55,10 +55,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid public void Initialise(IConfigSource config) { - //// This module is only on for standalones in hypergrid mode - //enabled = (!config.Configs["Startup"].GetBoolean("gridmode", true)) && - // config.Configs["Startup"].GetBoolean("hypergrid", true); - //m_log.DebugFormat("[RegionInventoryService]: enabled? {0}", enabled); m_Config = config; IConfig moduleConfig = config.Configs["Modules"]; if (moduleConfig != null) diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs index 1bd00f5..ae03cdf 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs @@ -51,10 +51,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory public void Initialise(IConfigSource config) { - //// This module is only on for standalones in hypergrid mode - //enabled = (!config.Configs["Startup"].GetBoolean("gridmode", true)) && - // config.Configs["Startup"].GetBoolean("hypergrid", true); - //m_log.DebugFormat("[RegionInventoryService]: enabled? {0}", enabled); m_Config = config; IConfig moduleConfig = config.Configs["Modules"]; if (moduleConfig != null) diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs index 4df9094..6949d7c 100644 --- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs +++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs @@ -101,21 +101,9 @@ namespace OpenSim.Region.DataSnapshot try { m_enabled = config.Configs["DataSnapshot"].GetBoolean("index_sims", m_enabled); - if (config.Configs["Startup"].GetBoolean("gridmode", false)) - { - m_gridinfo.Add( - "gridserverURL", - config.Configs["Network"].GetString( - "grid_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString())); - m_gridinfo.Add( - "userserverURL", - config.Configs["Network"].GetString( - "user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString())); - m_gridinfo.Add( - "assetserverURL", - config.Configs["Network"].GetString( - "asset_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString())); - } + IConfig conf = config.Configs["GridService"]; + if (conf != null) + m_gridinfo.Add("gridserverURL", conf.GetString("GridServerURI", "http://127.0.0.1:8003")); m_gridinfo.Add( "Name", config.Configs["DataSnapshot"].GetString("gridname", "the lost continent of hippo")); diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs index be2734d..b9a75cc 100644 --- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs +++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs @@ -66,7 +66,6 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule // private UUID EconomyBaseAccount = UUID.Zero; private float EnergyEfficiency = 0f; - private bool gridmode = false; // private ObjectPaid handerOnObjectPaid; private bool m_enabled = true; private bool m_sellEnabled = false; @@ -243,7 +242,6 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule { if (config == "Startup" && startupConfig != null) { - gridmode = startupConfig.GetBoolean("gridmode", false); m_enabled = (startupConfig.GetString("economymodule", "BetaGridLikeMoneyModule") == "BetaGridLikeMoneyModule"); } @@ -293,18 +291,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule private void GetClientFunds(IClientAPI client) { - // Here we check if we're in grid mode - // I imagine that the 'check balance' - // function for the client should be here or shortly after - - if (gridmode) - { - CheckExistAndRefreshFunds(client.AgentId); - } - else - { - CheckExistAndRefreshFunds(client.AgentId); - } + CheckExistAndRefreshFunds(client.AgentId); } -- cgit v1.1