Give ability to define constants that may be used throught the configuration
parent
29a05cdeb5
commit
c7a11899f6
|
@ -213,6 +213,8 @@ namespace OpenSim
|
||||||
// Make sure command line options take precedence
|
// Make sure command line options take precedence
|
||||||
m_config.Source.Merge(argvSource);
|
m_config.Source.Merge(argvSource);
|
||||||
|
|
||||||
|
m_config.Source.ReplaceKeyValues();
|
||||||
|
|
||||||
ReadConfigSettings();
|
ReadConfigSettings();
|
||||||
|
|
||||||
return m_config;
|
return m_config;
|
||||||
|
|
|
@ -129,6 +129,8 @@ namespace OpenSim.Server.Base
|
||||||
// Merge the configuration from the command line into the loaded file
|
// Merge the configuration from the command line into the loaded file
|
||||||
Config.Merge(argvConfig);
|
Config.Merge(argvConfig);
|
||||||
|
|
||||||
|
Config.ReplaceKeyValues();
|
||||||
|
|
||||||
// Refresh the startupConfig post merge
|
// Refresh the startupConfig post merge
|
||||||
if (Config.Configs["Startup"] != null)
|
if (Config.Configs["Startup"] != null)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue