From 8f8e20b39d5a3da004bd5995af62dd6c456b4d42 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Thu, 21 May 2009 23:07:26 +0000
Subject: Small update to make the command line work again

---
 OpenSim/Region/Application/ConfigurationLoader.cs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'OpenSim/Region/Application')

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
                 Environment.Exit(1);
             }
 
+            // Make sure command line options take precedence
+            //
+            m_config.Source.Merge(argvSource);
+
             ReadConfigSettings();
 
             return m_config;
-- 
cgit v1.1