From a97f6f86680026de6350f301d52307c187726875 Mon Sep 17 00:00:00 2001 From: BlueWall Date: Sat, 7 Sep 2013 13:11:31 -0400 Subject: [PATCH] Fix configuration/ini expansion issue. Thanks to smxy for testing. --- 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 bc7ecb71d1..010ae5aacc 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs @@ -203,10 +203,10 @@ namespace OpenSim m_config.Source.Merge(envConfigSource); } - ReadConfigSettings(); - m_config.Source.ExpandKeyValues(); + ReadConfigSettings(); + return m_config; }