diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 6f1a3cb..4738dfc 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.Configs["Startup"]; | 72 | IConfig startupConfig = m_config.ConfigSource.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.Merge(c.ConfigSource); | 531 | m_config.ConfigSource.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); |