aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSim.cs
diff options
context:
space:
mode:
authorMW2008-06-26 17:23:05 +0000
committerMW2008-06-26 17:23:05 +0000
commit314181a70d00d99506d3752653f1b0b87512ea44 (patch)
treeb1d048f6635209506642256c082004981e1585e2 /OpenSim/Region/Application/OpenSim.cs
parentAs per the suggestion on the mailing list, added support for a OpenSim.xml co... (diff)
downloadopensim-SC_OLD-314181a70d00d99506d3752653f1b0b87512ea44.zip
opensim-SC_OLD-314181a70d00d99506d3752653f1b0b87512ea44.tar.gz
opensim-SC_OLD-314181a70d00d99506d3752653f1b0b87512ea44.tar.bz2
opensim-SC_OLD-314181a70d00d99506d3752653f1b0b87512ea44.tar.xz
small change to last commit
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 4738dfc..8b42e2e 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -69,7 +69,7 @@ namespace OpenSim
69 69
70 protected override void ReadConfigSettings() 70 protected override void ReadConfigSettings()
71 { 71 {
72 IConfig startupConfig = m_config.ConfigSource.Configs["Startup"]; 72 IConfig startupConfig = m_config.Source.Configs["Startup"];
73 73
74 if (startupConfig != null) 74 if (startupConfig != null)
75 { 75 {
@@ -528,7 +528,7 @@ namespace OpenSim
528 c = DefaultConfig().AddConfig(cmdparams[1]); 528 c = DefaultConfig().AddConfig(cmdparams[1]);
529 string _value = String.Join(" ", cmdparams, 3, cmdparams.Length - 3); 529 string _value = String.Join(" ", cmdparams, 3, cmdparams.Length - 3);
530 c.Set(cmdparams[2], _value); 530 c.Set(cmdparams[2], _value);
531 m_config.ConfigSource.Merge(c.ConfigSource); 531 m_config.Source.Merge(c.ConfigSource);
532 532
533 m_console.Error(n, n + " " + n + " " + cmdparams[1] + " " + cmdparams[2] + " " + 533 m_console.Error(n, n + " " + n + " " + cmdparams[1] + " " + cmdparams[2] + " " +
534 _value); 534 _value);