diff options
| author | BlueWall | 2014-10-09 14:20:08 -0400 |
|---|---|---|
| committer | BlueWall | 2014-10-09 14:59:54 -0400 |
| commit | c7a11899f6c5ade7d59b998d78dbe0ef8fbd317c (patch) | |
| tree | ba057520c79f839f7b9bfde5e0340f67c36d77c2 /OpenSim/Region/Application | |
| parent | Change thread of osForceAttachToOvtherAvatarFromInventory to VeryHigh from Se... (diff) | |
| download | opensim-SC_OLD-c7a11899f6c5ade7d59b998d78dbe0ef8fbd317c.zip opensim-SC_OLD-c7a11899f6c5ade7d59b998d78dbe0ef8fbd317c.tar.gz opensim-SC_OLD-c7a11899f6c5ade7d59b998d78dbe0ef8fbd317c.tar.bz2 opensim-SC_OLD-c7a11899f6c5ade7d59b998d78dbe0ef8fbd317c.tar.xz | |
Give ability to define constants that may be used throught the configuration
Diffstat (limited to 'OpenSim/Region/Application')
| -rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 2 |
1 files changed, 2 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; |