OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Give ability to define constants that may be used throught the configuration

mb-throttle-test
BlueWall 2014-10-09 14:20:08 -04:00
parent 29a05cdeb5
commit c7a11899f6
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Application/ConfigurationLoader.cs
View File

@ -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;

2
OpenSim/Server/Base/ServicesServerBase.cs
View File

@ -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)
{ {