add a a missing monitor.wait if still not needed, mb in future
add a a missing monitor.wait if still not needed, mb in future
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
byte[] archive = archiveWriteStream.ToArray();
MemoryStream archiveReadStream = new MemoryStream(archive);
- Dictionary<string, object> archiveOptions = new Dictionary<string, object>();
- archiveOptions.Add("merge", null);
- m_archiverModule.DearchiveRegion(archiveReadStream, Guid.Empty, archiveOptions);
+ lock (this)
+ {
+ m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
+ Dictionary<string, object> archiveOptions = new Dictionary<string, object>();
+ archiveOptions.Add("merge", null);
+ m_archiverModule.DearchiveRegion(archiveReadStream, Guid.Empty, archiveOptions);
+ Monitor.Wait(this, 60000);
+ }
SceneObjectPart object1Existing = m_scene.GetSceneObjectPart(part1.Name);
Assert.That(object1Existing, Is.Not.Null, "object1 was not present after merge");