aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/ConfigurationLoaderTest.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-11-23 21:10:50 +0000
committerJustin Clark-Casey (justincc)2011-11-23 21:10:50 +0000
commit617f139aac0b851551bf7e8e463d397c60b13569 (patch)
tree17958d0783a2c0728e4a850f6e7f292c32b94ad6 /OpenSim/Tests/ConfigurationLoaderTest.cs
parentChange random number generator property name in pCampbot (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-617f139aac0b851551bf7e8e463d397c60b13569.zip
opensim-SC-617f139aac0b851551bf7e8e463d397c60b13569.tar.gz
opensim-SC-617f139aac0b851551bf7e8e463d397c60b13569.tar.bz2
opensim-SC-617f139aac0b851551bf7e8e463d397c60b13569.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Tests/ConfigurationLoaderTest.cs')
-rw-r--r--OpenSim/Tests/ConfigurationLoaderTest.cs4
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
109 // Prepare call to ConfigurationLoader.LoadConfigSettings() 109 // Prepare call to ConfigurationLoader.LoadConfigSettings()
110 ConfigurationLoader cl = new ConfigurationLoader(); 110 ConfigurationLoader cl = new ConfigurationLoader();
111 IConfigSource argvSource = new IniConfigSource(); 111 IConfigSource argvSource = new IniConfigSource();
112 EnvConfigSource envConfigSource = new EnvConfigSource();
112 argvSource.AddConfig("Startup").Set("inifile", mainIniFile); 113 argvSource.AddConfig("Startup").Set("inifile", mainIniFile);
113 ConfigSettings configSettings; 114 ConfigSettings configSettings;
114 NetworkServersInfo networkInfo; 115 NetworkServersInfo networkInfo;
115 116
116 OpenSimConfigSource source = cl.LoadConfigSettings(argvSource, out configSettings, out networkInfo); 117 OpenSimConfigSource source = cl.LoadConfigSettings(argvSource, envConfigSource,
118 out configSettings, out networkInfo);
117 119
118 // Remove default config 120 // Remove default config
119 config = source.Source.Configs["Startup"]; 121 config = source.Source.Configs["Startup"];