aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-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;