aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/ConfigurationLoader.cs
diff options
context:
space:
mode:
authorMelanie Thielker2009-05-21 23:07:26 +0000
committerMelanie Thielker2009-05-21 23:07:26 +0000
commit8f8e20b39d5a3da004bd5995af62dd6c456b4d42 (patch)
tree9617774c6132cf9782bf7f70232a6c866aca6d18 /OpenSim/Region/Application/ConfigurationLoader.cs
parentImplement .ini file includes. Anything that begins with "Include-" will be (diff)
downloadopensim-SC_OLD-8f8e20b39d5a3da004bd5995af62dd6c456b4d42.zip
opensim-SC_OLD-8f8e20b39d5a3da004bd5995af62dd6c456b4d42.tar.gz
opensim-SC_OLD-8f8e20b39d5a3da004bd5995af62dd6c456b4d42.tar.bz2
opensim-SC_OLD-8f8e20b39d5a3da004bd5995af62dd6c456b4d42.tar.xz
Small update to make the command line work again
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index b317db5..1be36ca 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -160,6 +160,10 @@ namespace OpenSim
160 Environment.Exit(1); 160 Environment.Exit(1);
161 } 161 }
162 162
163 // Make sure command line options take precedence
164 //
165 m_config.Source.Merge(argvSource);
166
163 ReadConfigSettings(); 167 ReadConfigSettings();
164 168
165 return m_config; 169 return m_config;