aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/ConfigurationLoader.cs
diff options
context:
space:
mode:
authorBlueWall2013-09-07 13:11:31 -0400
committerBlueWall2013-09-07 13:11:31 -0400
commita97f6f86680026de6350f301d52307c187726875 (patch)
tree4d26f554805ad5f53dfb5ab06140fadcd59d79b3 /OpenSim/Region/Application/ConfigurationLoader.cs
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-a97f6f86680026de6350f301d52307c187726875.zip
opensim-SC_OLD-a97f6f86680026de6350f301d52307c187726875.tar.gz
opensim-SC_OLD-a97f6f86680026de6350f301d52307c187726875.tar.bz2
opensim-SC_OLD-a97f6f86680026de6350f301d52307c187726875.tar.xz
Fix configuration/ini expansion issue. Thanks to smxy for testing.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index bc7ecb7..010ae5a 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -203,10 +203,10 @@ namespace OpenSim
203 m_config.Source.Merge(envConfigSource); 203 m_config.Source.Merge(envConfigSource);
204 } 204 }
205 205
206 ReadConfigSettings();
207
208 m_config.Source.ExpandKeyValues(); 206 m_config.Source.ExpandKeyValues();
209 207
208 ReadConfigSettings();
209
210 return m_config; 210 return m_config;
211 } 211 }
212 212