OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add a a missing monitor.wait if still not needed, mb in future

LSLKeyTest
UbitUmarov 2015-11-22 05:44:06 +00:00
parent 3be340cbf2
commit a6187db2a7
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
View File

@ -759,9 +759,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
byte[] archive = archiveWriteStream.ToArray(); byte[] archive = archiveWriteStream.ToArray();
MemoryStream archiveReadStream = new MemoryStream(archive); MemoryStream archiveReadStream = new MemoryStream(archive);
Dictionary<string, object> archiveOptions = new Dictionary<string, object>(); lock (this)
archiveOptions.Add("merge", null); {
m_archiverModule.DearchiveRegion(archiveReadStream, Guid.Empty, archiveOptions); 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); SceneObjectPart object1Existing = m_scene.GetSceneObjectPart(part1.Name);
Assert.That(object1Existing, Is.Not.Null, "object1 was not present after merge"); Assert.That(object1Existing, Is.Not.Null, "object1 was not present after merge");