aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs11
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index 21299f3..9de5c43 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -759,9 +759,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
759 byte[] archive = archiveWriteStream.ToArray(); 759 byte[] archive = archiveWriteStream.ToArray();
760 MemoryStream archiveReadStream = new MemoryStream(archive); 760 MemoryStream archiveReadStream = new MemoryStream(archive);
761 761
762 Dictionary<string, object> archiveOptions = new Dictionary<string, object>(); 762 lock (this)
763 archiveOptions.Add("merge", null); 763 {
764 m_archiverModule.DearchiveRegion(archiveReadStream, Guid.Empty, archiveOptions); 764 m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
765 Dictionary<string, object> archiveOptions = new Dictionary<string, object>();
766 archiveOptions.Add("merge", null);
767 m_archiverModule.DearchiveRegion(archiveReadStream, Guid.Empty, archiveOptions);
768 Monitor.Wait(this, 60000);
769 }
765 770
766 SceneObjectPart object1Existing = m_scene.GetSceneObjectPart(part1.Name); 771 SceneObjectPart object1Existing = m_scene.GetSceneObjectPart(part1.Name);
767 Assert.That(object1Existing, Is.Not.Null, "object1 was not present after merge"); 772 Assert.That(object1Existing, Is.Not.Null, "object1 was not present after merge");