From 6dcbd20cfa9763091d059cc5e440f00a3f7f6603 Mon Sep 17 00:00:00 2001
From: UbitUmarov <ajlduarte@sapo.pt>
Date: Sun, 22 Nov 2015 03:58:07 +0000
Subject: [PATCH]  add merge option on multioar test

---
 .../Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index f6065a032b..f3d77b10b5 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
             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);