diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 2 | ||||
-rw-r--r-- | OpenSim/Server/Base/ServicesServerBase.cs | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index 06ce145..b19e549 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs | |||
@@ -213,6 +213,8 @@ namespace OpenSim | |||
213 | // Make sure command line options take precedence | 213 | // Make sure command line options take precedence |
214 | m_config.Source.Merge(argvSource); | 214 | m_config.Source.Merge(argvSource); |
215 | 215 | ||
216 | m_config.Source.ReplaceKeyValues(); | ||
217 | |||
216 | ReadConfigSettings(); | 218 | ReadConfigSettings(); |
217 | 219 | ||
218 | return m_config; | 220 | return m_config; |
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs index 86a2551..d7d1306 100644 --- a/OpenSim/Server/Base/ServicesServerBase.cs +++ b/OpenSim/Server/Base/ServicesServerBase.cs | |||
@@ -129,6 +129,8 @@ namespace OpenSim.Server.Base | |||
129 | // Merge the configuration from the command line into the loaded file | 129 | // Merge the configuration from the command line into the loaded file |
130 | Config.Merge(argvConfig); | 130 | Config.Merge(argvConfig); |
131 | 131 | ||
132 | Config.ReplaceKeyValues(); | ||
133 | |||
132 | // Refresh the startupConfig post merge | 134 | // Refresh the startupConfig post merge |
133 | if (Config.Configs["Startup"] != null) | 135 | if (Config.Configs["Startup"] != null) |
134 | { | 136 | { |