Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge

1 files changed, 3 insertions, 1 deletions

diff --git a/OpenSim/Tests/ConfigurationLoaderTest.cs b/OpenSim/Tests/ConfigurationLoaderTest.cs
index c777acc..067264d 100644
--- a/OpenSim/Tests/ConfigurationLoaderTest.cs
+++ b/OpenSim/Tests/ConfigurationLoaderTest.cs
@@ -109,11 +109,13 @@ namespace OpenSim.Tests
             // Prepare call to ConfigurationLoader.LoadConfigSettings()
             ConfigurationLoader cl = new ConfigurationLoader();
             IConfigSource argvSource = new IniConfigSource();
+            EnvConfigSource envConfigSource = new EnvConfigSource();
             argvSource.AddConfig("Startup").Set("inifile", mainIniFile);
             ConfigSettings configSettings;
             NetworkServersInfo networkInfo;
 
-            OpenSimConfigSource source = cl.LoadConfigSettings(argvSource, out configSettings, out networkInfo);
+            OpenSimConfigSource source = cl.LoadConfigSettings(argvSource, envConfigSource,
+                out configSettings, out networkInfo);
 
             // Remove default config
             config = source.Source.Configs["Startup"];