diff options
| author | Melanie | 2011-11-24 01:16:37 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-24 01:16:37 +0000 |
| commit | a8270cb48cf8dbca7595da5963d8fafdb1141529 (patch) | |
| tree | cf878acca0c652239f4441c3783647b6b0b688a6 /OpenSim/Tests | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Append asset ID to URL for storage requests to allow caching proxies to work ... (diff) | |
| download | opensim-SC_OLD-a8270cb48cf8dbca7595da5963d8fafdb1141529.zip opensim-SC_OLD-a8270cb48cf8dbca7595da5963d8fafdb1141529.tar.gz opensim-SC_OLD-a8270cb48cf8dbca7595da5963d8fafdb1141529.tar.bz2 opensim-SC_OLD-a8270cb48cf8dbca7595da5963d8fafdb1141529.tar.xz | |
Merge branch 'master' into bigmerge
Diffstat (limited to 'OpenSim/Tests')
| -rw-r--r-- | OpenSim/Tests/ConfigurationLoaderTest.cs | 4 |
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"]; |