diff options
author | Justin Clark-Casey (justincc) | 2011-11-23 21:10:50 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-11-23 21:10:50 +0000 |
commit | 617f139aac0b851551bf7e8e463d397c60b13569 (patch) | |
tree | 17958d0783a2c0728e4a850f6e7f292c32b94ad6 /OpenSim/Region/Application/ConfigurationLoader.cs | |
parent | Change random number generator property name in pCampbot (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-617f139aac0b851551bf7e8e463d397c60b13569.zip opensim-SC_OLD-617f139aac0b851551bf7e8e463d397c60b13569.tar.gz opensim-SC_OLD-617f139aac0b851551bf7e8e463d397c60b13569.tar.bz2 opensim-SC_OLD-617f139aac0b851551bf7e8e463d397c60b13569.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Application/ConfigurationLoader.cs')
-rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index d0f6ab7..4a7c8b0 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs | |||
@@ -70,7 +70,7 @@ namespace OpenSim | |||
70 | /// <param name="networkInfo"></param> | 70 | /// <param name="networkInfo"></param> |
71 | /// <returns>A configuration that gets passed to modules</returns> | 71 | /// <returns>A configuration that gets passed to modules</returns> |
72 | public OpenSimConfigSource LoadConfigSettings( | 72 | public OpenSimConfigSource LoadConfigSettings( |
73 | IConfigSource argvSource, out ConfigSettings configSettings, | 73 | IConfigSource argvSource, EnvConfigSource envConfigSource, out ConfigSettings configSettings, |
74 | out NetworkServersInfo networkInfo) | 74 | out NetworkServersInfo networkInfo) |
75 | { | 75 | { |
76 | m_configSettings = configSettings = new ConfigSettings(); | 76 | m_configSettings = configSettings = new ConfigSettings(); |
@@ -195,6 +195,24 @@ namespace OpenSim | |||
195 | // Make sure command line options take precedence | 195 | // Make sure command line options take precedence |
196 | m_config.Source.Merge(argvSource); | 196 | m_config.Source.Merge(argvSource); |
197 | 197 | ||
198 | |||
199 | IConfig enVars = m_config.Source.Configs["Environment"]; | ||
200 | |||
201 | if( enVars != null ) | ||
202 | { | ||
203 | string[] env_keys = enVars.GetKeys(); | ||
204 | |||
205 | foreach ( string key in env_keys ) | ||
206 | { | ||
207 | envConfigSource.AddEnv(key, string.Empty); | ||
208 | } | ||
209 | |||
210 | envConfigSource.LoadEnv(); | ||
211 | m_config.Source.Merge(envConfigSource); | ||
212 | m_config.Source.ExpandKeyValues(); | ||
213 | } | ||
214 | |||
215 | |||
198 | ReadConfigSettings(); | 216 | ReadConfigSettings(); |
199 | 217 | ||
200 | return m_config; | 218 | return m_config; |