Small update to make the command line work again

2009-05-21 23:07:26 +00:00 · 2009-05-21 23:07:26 +00:00 · 8f8e20b39d
parent e5f3337c3f
commit 8f8e20b39d
1 changed files with 4 additions and 0 deletions
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@ -160,6 +160,10 @@ namespace OpenSim
                Environment.Exit(1);
            }

+            // Make sure command line options take precedence
+            //
+            m_config.Source.Merge(argvSource);
+
            ReadConfigSettings();

            return m_config;