aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs29
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
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Threading; 30using System.Threading;
31using NUnit.Framework; 31using log4net.Config;
32using NUnit.Framework.SyntaxHelpers; 32using NUnit.Framework;
33using OpenMetaverse; 33using NUnit.Framework.SyntaxHelpers;
34using OpenSim.Framework; 34using OpenMetaverse;
35using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Framework;
36using OpenSim.Region.CoreModules.World.Archiver; 36using OpenSim.Region.CoreModules.World.Serialiser;
37using OpenSim.Region.CoreModules.World.Serialiser; 37using OpenSim.Region.CoreModules.World.Terrain;
38using OpenSim.Region.CoreModules.World.Terrain; 38using OpenSim.Region.Framework.Scenes;
39using OpenSim.Region.Framework.Scenes; 39using OpenSim.Tests.Common.Setup;
40using OpenSim.Tests.Common.Setup; 40
41
42namespace OpenSim.Region.CoreModules.World.Archiver.Tests 41namespace 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