From a8c0e16e474e5857ca83791d6bd1a484e2cfc9c9 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Thu, 29 Aug 2013 14:35:56 -0400
Subject: Initialization: move key expansion out to operate on all sources and
 not just environment variables

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

diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 3e93638..bc7ecb7 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -201,11 +201,11 @@ namespace OpenSim
 
                 envConfigSource.LoadEnv();
                 m_config.Source.Merge(envConfigSource);
-                m_config.Source.ExpandKeyValues();
             }
 
-
             ReadConfigSettings();
+            
+            m_config.Source.ExpandKeyValues();
 
             return m_config;
         }
-- 
cgit v1.1