OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

a little bit more refactoring of startup

0.6.0-stable
MW 2008-11-06 20:17:20 +00:00
parent d31d02c373
commit c932aae4c3
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Application/OpenSim.cs
View File

@ -69,6 +69,8 @@ namespace OpenSim
protected override void ReadExtraConfigSettings() protected override void ReadExtraConfigSettings()
{ {
base.ReadExtraConfigSettings();
IConfig startupConfig = m_config.Source.Configs["Startup"]; IConfig startupConfig = m_config.Source.Configs["Startup"];
if (startupConfig != null) if (startupConfig != null)

14
OpenSim/Region/Application/OpenSimBase.cs
View File

@ -146,10 +146,15 @@ namespace OpenSim
protected virtual void ReadExtraConfigSettings() 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<IApplicationPlugin> loader = PluginLoader<IApplicationPlugin> loader =
new PluginLoader<IApplicationPlugin>(new ApplicationPluginInitialiser(this)); new PluginLoader<IApplicationPlugin>(new ApplicationPluginInitialiser(this));
@ -181,9 +186,6 @@ namespace OpenSim
InitialiseGridServices(libraryRootFolder); 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 // Create a ModuleLoader instance
m_moduleLoader = new ModuleLoader(m_config.Source); m_moduleLoader = new ModuleLoader(m_config.Source);
@ -260,7 +262,7 @@ namespace OpenSim
/// <summary> /// <summary>
/// Initialises the assetcache /// Initialises the assetcache
/// </summary> /// </summary>
protected void InitialiseAssetCache() protected virtual void InitialiseAssetCache()
{ {
IAssetServer assetServer; IAssetServer assetServer;
if (m_configSettings.AssetStorage == "grid") if (m_configSettings.AssetStorage == "grid")