diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 763aaa5900..884b081ed3 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -69,6 +69,8 @@ namespace OpenSim protected override void ReadExtraConfigSettings() { + base.ReadExtraConfigSettings(); + IConfig startupConfig = m_config.Source.Configs["Startup"]; if (startupConfig != null) diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index f1ff08ff03..69e80215ec 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -146,10 +146,15 @@ namespace OpenSim protected virtual void ReadExtraConfigSettings() { - + IConfig networkConfig = m_config.Source.Configs["Network"]; + if (networkConfig != null) + { + proxyUrl = networkConfig.GetString("proxy_url", ""); + proxyOffset = Int32.Parse(networkConfig.GetString("proxy_offset", "0")); + } } - protected void LoadPlugins() + protected virtual void LoadPlugins() { PluginLoader loader = new PluginLoader(new ApplicationPluginInitialiser(this)); @@ -181,9 +186,6 @@ namespace OpenSim InitialiseGridServices(libraryRootFolder); } - proxyUrl = ConfigSource.Source.Configs["Network"].GetString("proxy_url", ""); - proxyOffset = Int32.Parse(ConfigSource.Source.Configs["Network"].GetString("proxy_offset", "0")); - // Create a ModuleLoader instance m_moduleLoader = new ModuleLoader(m_config.Source); @@ -260,7 +262,7 @@ namespace OpenSim /// /// Initialises the assetcache /// - protected void InitialiseAssetCache() + protected virtual void InitialiseAssetCache() { IAssetServer assetServer; if (m_configSettings.AssetStorage == "grid")