Initialization: move key expansion out to operate on all sources and not just environment variables
parent
aa521fb385
commit
a8c0e16e47
|
@ -201,12 +201,12 @@ namespace OpenSim
|
||||||
|
|
||||||
envConfigSource.LoadEnv();
|
envConfigSource.LoadEnv();
|
||||||
m_config.Source.Merge(envConfigSource);
|
m_config.Source.Merge(envConfigSource);
|
||||||
m_config.Source.ExpandKeyValues();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
ReadConfigSettings();
|
ReadConfigSettings();
|
||||||
|
|
||||||
|
m_config.Source.ExpandKeyValues();
|
||||||
|
|
||||||
return m_config;
|
return m_config;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue