diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index 7211d381a4..d9ec23bc7c 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 archiveOptions = new Dictionary(); - archiveOptions.Add("merge", null); +// archiveOptions.Add("merge", null); m_archiverModule.DearchiveRegion(archiveReadStream, Guid.Empty, archiveOptions); } Monitor.Wait(this, 60000);