diff options
author | UbitUmarov | 2015-11-22 03:58:07 +0000 |
---|---|---|
committer | UbitUmarov | 2015-11-22 03:58:07 +0000 |
commit | 6dcbd20cfa9763091d059cc5e440f00a3f7f6603 (patch) | |
tree | 53887f890e815b8aa8590b9c2e9bbc81b0467f6b /OpenSim | |
parent | minor changes (diff) | |
download | opensim-SC_OLD-6dcbd20cfa9763091d059cc5e440f00a3f7f6603.zip opensim-SC_OLD-6dcbd20cfa9763091d059cc5e440f00a3f7f6603.tar.gz opensim-SC_OLD-6dcbd20cfa9763091d059cc5e440f00a3f7f6603.tar.bz2 opensim-SC_OLD-6dcbd20cfa9763091d059cc5e440f00a3f7f6603.tar.xz |
add merge option on multioar test
Diffstat (limited to 'OpenSim')
-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); |