diff options
author | BlueWall | 2013-08-29 14:35:56 -0400 |
---|---|---|
committer | BlueWall | 2013-08-29 14:35:56 -0400 |
commit | a8c0e16e474e5857ca83791d6bd1a484e2cfc9c9 (patch) | |
tree | e284054aa6e78a61e5f644de929caab79a679874 /OpenSim/Region/Application/ConfigurationLoader.cs | |
parent | Do not add a port zero to end of the hypergrid gateway host name. (diff) | |
download | opensim-SC_OLD-a8c0e16e474e5857ca83791d6bd1a484e2cfc9c9.zip opensim-SC_OLD-a8c0e16e474e5857ca83791d6bd1a484e2cfc9c9.tar.gz opensim-SC_OLD-a8c0e16e474e5857ca83791d6bd1a484e2cfc9c9.tar.bz2 opensim-SC_OLD-a8c0e16e474e5857ca83791d6bd1a484e2cfc9c9.tar.xz |
Initialization: move key expansion out to operate on all sources and not just environment variables
Diffstat (limited to 'OpenSim/Region/Application/ConfigurationLoader.cs')
-rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index 3e93638..bc7ecb7 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs | |||
@@ -201,11 +201,11 @@ namespace OpenSim | |||
201 | 201 | ||
202 | envConfigSource.LoadEnv(); | 202 | envConfigSource.LoadEnv(); |
203 | m_config.Source.Merge(envConfigSource); | 203 | m_config.Source.Merge(envConfigSource); |
204 | m_config.Source.ExpandKeyValues(); | ||
205 | } | 204 | } |
206 | 205 | ||
207 | |||
208 | ReadConfigSettings(); | 206 | ReadConfigSettings(); |
207 | |||
208 | m_config.Source.ExpandKeyValues(); | ||
209 | 209 | ||
210 | return m_config; | 210 | return m_config; |
211 | } | 211 | } |