diff options
| author | Melanie | 2010-09-14 22:03:42 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-14 22:03:42 +0100 |
| commit | 1212cb0c7442619f47f3937d0d8b7ed0ee5f6090 (patch) | |
| tree | 776d0ff51f06ad2a30dbbacb7ddfd183766f0344 /OpenSim/Tests | |
| parent | Fix a small left over buglet and also add checking of the physics actor (diff) | |
| parent | Fix "show threads" to show threads now being managed by OpenSim.Framework.Wat... (diff) | |
| download | opensim-SC-1212cb0c7442619f47f3937d0d8b7ed0ee5f6090.zip opensim-SC-1212cb0c7442619f47f3937d0d8b7ed0ee5f6090.tar.gz opensim-SC-1212cb0c7442619f47f3937d0d8b7ed0ee5f6090.tar.bz2 opensim-SC-1212cb0c7442619f47f3937d0d8b7ed0ee5f6090.tar.xz | |
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 |