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/Server | |
| 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/Server')
| -rw-r--r-- | OpenSim/Server/Base/ServicesServerBase.cs | 2 |
1 files changed, 2 insertions, 0 deletions
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 | { |