From c7a11899f6c5ade7d59b998d78dbe0ef8fbd317c Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Thu, 9 Oct 2014 14:20:08 -0400
Subject: Give ability to define constants that may be used throught the
 configuration

---
 OpenSim/Region/Application/ConfigurationLoader.cs | 2 ++
 OpenSim/Server/Base/ServicesServerBase.cs         | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 06ce145..b19e549 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -213,6 +213,8 @@ namespace OpenSim
             // Make sure command line options take precedence
             m_config.Source.Merge(argvSource);
 
+            m_config.Source.ReplaceKeyValues();
+
             ReadConfigSettings();
 
             return m_config;
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 86a2551..d7d1306 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -129,6 +129,8 @@ namespace OpenSim.Server.Base
             // Merge the configuration from the command line into the loaded file
             Config.Merge(argvConfig);
 
+            Config.ReplaceKeyValues();
+
             // Refresh the startupConfig post merge
             if (Config.Configs["Startup"] != null)
             {
-- 
cgit v1.1