ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 14:16:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

add merge option on multioar test

Browse Source
This commit is contained in:
UbitUmarov
2015-11-22 03:58:07 +00:00
parent 71f5c2b856
commit 6dcbd20cfa
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1012,7 +1012,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
lock (this)
{
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);