From 1de096dffbb24fc7a92f27fdbd212231a4b5cefd Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sun, 22 Nov 2015 08:00:58 +0000
Subject:  coment out merge option on multiregion oar load i added

---
 OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules/World/Archiver')

diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index 7211d38..d9ec23b 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -1022,7 +1022,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             {
                 m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
                 Dictionary<string, object> archiveOptions = new Dictionary<string, object>();
-                archiveOptions.Add("merge", null);
+//                archiveOptions.Add("merge", null);
                 m_archiverModule.DearchiveRegion(archiveReadStream, Guid.Empty, archiveOptions);
             }
             Monitor.Wait(this, 60000);
-- 
cgit v1.1