aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSim.cs
diff options
context:
space:
mode:
authorMW2008-11-05 20:14:52 +0000
committerMW2008-11-05 20:14:52 +0000
commit571b94f537cc1f431ed52e6a185863ae17357f30 (patch)
treeff5381abcf3237c7a9339a1b5e2904d88f75bfa1 /OpenSim/Region/Application/OpenSim.cs
parent* Zap the letters that accidentally crept in to the license in EventQueueThre... (diff)
downloadopensim-SC_OLD-571b94f537cc1f431ed52e6a185863ae17357f30.zip
opensim-SC_OLD-571b94f537cc1f431ed52e6a185863ae17357f30.tar.gz
opensim-SC_OLD-571b94f537cc1f431ed52e6a185863ae17357f30.tar.bz2
opensim-SC_OLD-571b94f537cc1f431ed52e6a185863ae17357f30.tar.xz
moved the initial loading/setting of the config settings to its own class, ConfigurationLoader. To make it easier to customise the loading of those settings and possible in the future move it to a plugin.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index e710ec2..763aaa5 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -67,7 +67,7 @@ namespace OpenSim
67 { 67 {
68 } 68 }
69 69
70 protected override void ReadConfigSettings() 70 protected override void ReadExtraConfigSettings()
71 { 71 {
72 IConfig startupConfig = m_config.Source.Configs["Startup"]; 72 IConfig startupConfig = m_config.Source.Configs["Startup"];
73 73
@@ -78,7 +78,6 @@ namespace OpenSim
78 78
79 m_timedScript = startupConfig.GetString("timer_Script", "disabled"); 79 m_timedScript = startupConfig.GetString("timer_Script", "disabled");
80 } 80 }
81 base.ReadConfigSettings();
82 } 81 }
83 82
84 /// <summary> 83 /// <summary>