diff options
| author | Melanie | 2013-02-27 18:05:04 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-27 18:05:04 +0000 |
| commit | 578174d21c82e7249016e31f0c63215e67f92f17 (patch) | |
| tree | c9c970d2ce4836dcf894922172d784d16cbc2837 /OpenSim/Tests/ConfigurationLoaderTest.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Improve description of GenerateMapTiles config option (diff) | |
| download | opensim-SC_OLD-578174d21c82e7249016e31f0c63215e67f92f17.zip opensim-SC_OLD-578174d21c82e7249016e31f0c63215e67f92f17.tar.gz opensim-SC_OLD-578174d21c82e7249016e31f0c63215e67f92f17.tar.bz2 opensim-SC_OLD-578174d21c82e7249016e31f0c63215e67f92f17.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Tests/ConfigurationLoaderTest.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Tests/ConfigurationLoaderTest.cs b/OpenSim/Tests/ConfigurationLoaderTest.cs index e5186ae..9d63324 100644 --- a/OpenSim/Tests/ConfigurationLoaderTest.cs +++ b/OpenSim/Tests/ConfigurationLoaderTest.cs | |||
| @@ -47,6 +47,8 @@ namespace OpenSim.Tests | |||
| 47 | [SetUp] | 47 | [SetUp] |
| 48 | public void SetUp() | 48 | public void SetUp() |
| 49 | { | 49 | { |
| 50 | base.SetUp(); | ||
| 51 | |||
| 50 | m_basePath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()); | 52 | m_basePath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()); |
| 51 | string path = Path.Combine(m_basePath, m_testSubdirectory); | 53 | string path = Path.Combine(m_basePath, m_testSubdirectory); |
| 52 | Directory.CreateDirectory(path); | 54 | Directory.CreateDirectory(path); |