diff options
| author | Melanie Thielker | 2010-09-14 22:14:23 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2010-09-14 22:14:23 +0200 |
| commit | 540a1912cea13f42b3fb6f4e4152de2be46f062c (patch) | |
| tree | 1ba8209dc0f40780181499be8556c8fe6fc97ceb /OpenSim/Tests | |
| parent | Adjust the code for ghost prim removal to new information from Kitto (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC_OLD-540a1912cea13f42b3fb6f4e4152de2be46f062c.zip opensim-SC_OLD-540a1912cea13f42b3fb6f4e4152de2be46f062c.tar.gz opensim-SC_OLD-540a1912cea13f42b3fb6f4e4152de2be46f062c.tar.bz2 opensim-SC_OLD-540a1912cea13f42b3fb6f4e4152de2be46f062c.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster 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 |