diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index f6065a0..f3d77b1 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |||
@@ -1012,7 +1012,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
1012 | lock (this) | 1012 | lock (this) |
1013 | { | 1013 | { |
1014 | m_scene.EventManager.OnOarFileLoaded += LoadCompleted; | 1014 | m_scene.EventManager.OnOarFileLoaded += LoadCompleted; |
1015 | m_archiverModule.DearchiveRegion(archiveReadStream); | 1015 | Dictionary<string, object> archiveOptions = new Dictionary<string, object>(); |
1016 | archiveOptions.Add("merge", null); | ||
1017 | m_archiverModule.DearchiveRegion(archiveReadStream, Guid.Empty, archiveOptions); | ||
1016 | } | 1018 | } |
1017 | 1019 | ||
1018 | Assert.That(m_lastErrorMessage, Is.Null); | 1020 | Assert.That(m_lastErrorMessage, Is.Null); |