diff options
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Tests')
| -rw-r--r-- | OpenSim/Tests/ConfigurationLoaderTest.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/ConfigurationLoaderTest.cs b/OpenSim/Tests/ConfigurationLoaderTest.cs index 4262c95..c777acc 100644 --- a/OpenSim/Tests/ConfigurationLoaderTest.cs +++ b/OpenSim/Tests/ConfigurationLoaderTest.cs | |||
| @@ -69,7 +69,7 @@ namespace OpenSim.Tests | |||
| 69 | [Test] | 69 | [Test] |
| 70 | public void IncludeTests() | 70 | public void IncludeTests() |
| 71 | { | 71 | { |
| 72 | const string mainIniFile = "OpenSim.ini"; | 72 | const string mainIniFile = "OpenSimDefaults.ini"; |
| 73 | m_config = new IniConfigSource(); | 73 | m_config = new IniConfigSource(); |
| 74 | 74 | ||
| 75 | // Create ini files in a directory structure | 75 | // Create ini files in a directory structure |