aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/ConfigurationLoaderTest.cs
diff options
context:
space:
mode:
authorDan Lake2011-11-23 16:11:17 -0800
committerDan Lake2011-11-23 16:11:17 -0800
commit5485e3da460ae954acb225f1b7988b576226fb3a (patch)
tree7755fd14d85264ea8deac2a1d73e3b8eeb627673 /OpenSim/Tests/ConfigurationLoaderTest.cs
parentLine endings (diff)
parentPrint out what behaviours are active when pCampBot starts up (diff)
downloadopensim-SC-5485e3da460ae954acb225f1b7988b576226fb3a.zip
opensim-SC-5485e3da460ae954acb225f1b7988b576226fb3a.tar.gz
opensim-SC-5485e3da460ae954acb225f1b7988b576226fb3a.tar.bz2
opensim-SC-5485e3da460ae954acb225f1b7988b576226fb3a.tar.xz
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to '')
-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"];