add merge option on multioar test
parent
71f5c2b856
commit
6dcbd20cfa
|
@ -1012,7 +1012,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
|
||||||
lock (this)
|
lock (this)
|
||||||
{
|
{
|
||||||
m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
|
m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
|
||||||
m_archiverModule.DearchiveRegion(archiveReadStream);
|
Dictionary<string, object> archiveOptions = new Dictionary<string, object>();
|
||||||
|
archiveOptions.Add("merge", null);
|
||||||
|
m_archiverModule.DearchiveRegion(archiveReadStream, Guid.Empty, archiveOptions);
|
||||||
}
|
}
|
||||||
|
|
||||||
Assert.That(m_lastErrorMessage, Is.Null);
|
Assert.That(m_lastErrorMessage, Is.Null);
|
||||||
|
|
Loading…
Reference in New Issue