diff options
| author | Melanie | 2019-08-07 17:58:55 +0100 |
|---|---|---|
| committer | Melanie | 2019-08-07 17:58:55 +0100 |
| commit | ba680ceecba3dd07fc794a7a2c2a77b2dc9471df (patch) | |
| tree | 0a64eefac9de3746e78c1116b2858d577133773f /OpenSim/Tests | |
| parent | Fix scope support to get friends list names across co-hosted grids (diff) | |
| parent | cap EstateAccess: don't meed with keepAlive unless needed (diff) | |
| download | opensim-SC-ba680ceecba3dd07fc794a7a2c2a77b2dc9471df.zip opensim-SC-ba680ceecba3dd07fc794a7a2c2a77b2dc9471df.tar.gz opensim-SC-ba680ceecba3dd07fc794a7a2c2a77b2dc9471df.tar.bz2 opensim-SC-ba680ceecba3dd07fc794a7a2c2a77b2dc9471df.tar.xz | |
Merge branch 'master' of brain.opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Tests')
| -rw-r--r-- | OpenSim/Tests/ConfigurationLoaderTest.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Tests/ConfigurationLoaderTest.cs b/OpenSim/Tests/ConfigurationLoaderTest.cs index a409a13..2a67b84 100644 --- a/OpenSim/Tests/ConfigurationLoaderTest.cs +++ b/OpenSim/Tests/ConfigurationLoaderTest.cs | |||
| @@ -114,6 +114,7 @@ namespace OpenSim.Tests | |||
| 114 | IConfigSource argvSource = new IniConfigSource(); | 114 | IConfigSource argvSource = new IniConfigSource(); |
| 115 | EnvConfigSource envConfigSource = new EnvConfigSource(); | 115 | EnvConfigSource envConfigSource = new EnvConfigSource(); |
| 116 | argvSource.AddConfig("Startup").Set("inifile", mainIniFile); | 116 | argvSource.AddConfig("Startup").Set("inifile", mainIniFile); |
| 117 | argvSource.AddConfig("Network"); | ||
| 117 | ConfigSettings configSettings; | 118 | ConfigSettings configSettings; |
| 118 | NetworkServersInfo networkInfo; | 119 | NetworkServersInfo networkInfo; |
| 119 | 120 | ||