aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/ConfigurationLoaderTest.cs
diff options
context:
space:
mode:
authorBlueWall2011-11-19 11:01:51 -0500
committerBlueWall2011-11-23 10:11:47 -0500
commitd4e3a7fe81a155be841bc0d182aa7a14083ffa3e (patch)
tree917e7b363a879dcc45035f917f90408638327da6 /OpenSim/Tests/ConfigurationLoaderTest.cs
parentImprove the error messages returned if the HelloNeighbour call fails. (diff)
downloadopensim-SC_OLD-d4e3a7fe81a155be841bc0d182aa7a14083ffa3e.zip
opensim-SC_OLD-d4e3a7fe81a155be841bc0d182aa7a14083ffa3e.tar.gz
opensim-SC_OLD-d4e3a7fe81a155be841bc0d182aa7a14083ffa3e.tar.bz2
opensim-SC_OLD-d4e3a7fe81a155be841bc0d182aa7a14083ffa3e.tar.xz
Shell Environment Variables in config
Adding updated Nini and support to use shell environment variables in OpenSimulator configuration. Nini @ https://github.com/BlueWall/Nini-Dev
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"];