diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index f201e74..1ad7e9e 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |||
@@ -25,20 +25,19 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Threading; | 30 | using System.Threading; |
31 | using NUnit.Framework; | 31 | using log4net.Config; |
32 | using NUnit.Framework.SyntaxHelpers; | 32 | using NUnit.Framework; |
33 | using OpenMetaverse; | 33 | using NUnit.Framework.SyntaxHelpers; |
34 | using OpenSim.Framework; | 34 | using OpenMetaverse; |
35 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Region.CoreModules.World.Archiver; | 36 | using OpenSim.Region.CoreModules.World.Serialiser; |
37 | using OpenSim.Region.CoreModules.World.Serialiser; | 37 | using OpenSim.Region.CoreModules.World.Terrain; |
38 | using OpenSim.Region.CoreModules.World.Terrain; | 38 | using OpenSim.Region.Framework.Scenes; |
39 | using OpenSim.Region.Framework.Scenes; | 39 | using OpenSim.Tests.Common.Setup; |
40 | using OpenSim.Tests.Common.Setup; | 40 | |
41 | |||
42 | namespace OpenSim.Region.CoreModules.World.Archiver.Tests | 41 | namespace OpenSim.Region.CoreModules.World.Archiver.Tests |
43 | { | 42 | { |
44 | [TestFixture] | 43 | [TestFixture] |
@@ -222,7 +221,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
222 | [Test] | 221 | [Test] |
223 | public void TestMergeOarV0p2() | 222 | public void TestMergeOarV0p2() |
224 | { | 223 | { |
225 | log4net.Config.XmlConfigurator.Configure(); | 224 | XmlConfigurator.Configure(); |
226 | 225 | ||
227 | MemoryStream archiveWriteStream = new MemoryStream(); | 226 | MemoryStream archiveWriteStream = new MemoryStream(); |
228 | 227 | ||