diff options
| author | Diva Canto | 2010-01-31 13:01:23 -0800 |
|---|---|---|
| committer | Diva Canto | 2010-01-31 13:01:23 -0800 |
| commit | 041594ed075049f804fc157700a6d78e54194c0b (patch) | |
| tree | ed89689bfdc1948b184438ee4c7329e0296660b4 /OpenSim/Region/CoreModules | |
| parent | * Bug fix in XInventoryData -- groupOwned is an int in the DB (diff) | |
| download | opensim-SC-041594ed075049f804fc157700a6d78e54194c0b.zip opensim-SC-041594ed075049f804fc157700a6d78e54194c0b.tar.gz opensim-SC-041594ed075049f804fc157700a6d78e54194c0b.tar.bz2 opensim-SC-041594ed075049f804fc157700a6d78e54194c0b.tar.xz | |
Cleaned up configuration. 'gridmode' and 'hypergrid' are gone, as well as lots of other obsolete configs.
Diffstat (limited to 'OpenSim/Region/CoreModules')
4 files changed, 0 insertions, 17 deletions
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 | |||
| 51 | 51 | ||
| 52 | public void Initialise(IConfigSource config) | 52 | public void Initialise(IConfigSource config) |
| 53 | { | 53 | { |
| 54 | //// This module is only on for standalones in hypergrid mode | ||
| 55 | //enabled = ((!config.Configs["Startup"].GetBoolean("gridmode", true)) && | ||
| 56 | // config.Configs["Startup"].GetBoolean("hypergrid", true)) || | ||
| 57 | // ((config.Configs["MXP"] != null) && config.Configs["MXP"].GetBoolean("Enabled", true)); | ||
| 58 | //m_log.DebugFormat("[RegionAssetService]: enabled? {0}", enabled); | ||
| 59 | m_Config = config; | 54 | m_Config = config; |
| 60 | IConfig moduleConfig = config.Configs["Modules"]; | 55 | IConfig moduleConfig = config.Configs["Modules"]; |
| 61 | if (moduleConfig != null) | 56 | 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 | |||
| 53 | 53 | ||
| 54 | public void Initialise(IConfigSource config) | 54 | public void Initialise(IConfigSource config) |
| 55 | { | 55 | { |
| 56 | //// This module is only on for standalones in hypergrid mode | ||
| 57 | //enabled = (!config.Configs["Startup"].GetBoolean("gridmode", true)) && | ||
| 58 | // config.Configs["Startup"].GetBoolean("hypergrid", true); | ||
| 59 | //m_log.DebugFormat("[RegionInventoryService]: enabled? {0}", enabled); | ||
| 60 | m_Config = config; | 56 | m_Config = config; |
| 61 | IConfig moduleConfig = config.Configs["Modules"]; | 57 | IConfig moduleConfig = config.Configs["Modules"]; |
| 62 | if (moduleConfig != null) | 58 | 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 | |||
| 55 | 55 | ||
| 56 | public void Initialise(IConfigSource config) | 56 | public void Initialise(IConfigSource config) |
| 57 | { | 57 | { |
| 58 | //// This module is only on for standalones in hypergrid mode | ||
| 59 | //enabled = (!config.Configs["Startup"].GetBoolean("gridmode", true)) && | ||
| 60 | // config.Configs["Startup"].GetBoolean("hypergrid", true); | ||
| 61 | //m_log.DebugFormat("[RegionInventoryService]: enabled? {0}", enabled); | ||
| 62 | m_Config = config; | 58 | m_Config = config; |
| 63 | IConfig moduleConfig = config.Configs["Modules"]; | 59 | IConfig moduleConfig = config.Configs["Modules"]; |
| 64 | if (moduleConfig != null) | 60 | 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 | |||
| 51 | 51 | ||
| 52 | public void Initialise(IConfigSource config) | 52 | public void Initialise(IConfigSource config) |
| 53 | { | 53 | { |
| 54 | //// This module is only on for standalones in hypergrid mode | ||
| 55 | //enabled = (!config.Configs["Startup"].GetBoolean("gridmode", true)) && | ||
| 56 | // config.Configs["Startup"].GetBoolean("hypergrid", true); | ||
| 57 | //m_log.DebugFormat("[RegionInventoryService]: enabled? {0}", enabled); | ||
| 58 | m_Config = config; | 54 | m_Config = config; |
| 59 | IConfig moduleConfig = config.Configs["Modules"]; | 55 | IConfig moduleConfig = config.Configs["Modules"]; |
| 60 | if (moduleConfig != null) | 56 | if (moduleConfig != null) |