OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

coment out merge option on multiregion oar load i added

LSLKeyTest
UbitUmarov 2015-11-22 08:00:58 +00:00
parent 5c3f88b64d
commit 1de096dffb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
View File

@ -1022,7 +1022,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
{ {
m_scene.EventManager.OnOarFileLoaded += LoadCompleted; m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
Dictionary<string, object> archiveOptions = new Dictionary<string, object>(); Dictionary<string, object> archiveOptions = new Dictionary<string, object>();
archiveOptions.Add("merge", null); // archiveOptions.Add("merge", null);
m_archiverModule.DearchiveRegion(archiveReadStream, Guid.Empty, archiveOptions); m_archiverModule.DearchiveRegion(archiveReadStream, Guid.Empty, archiveOptions);
} }
Monitor.Wait(this, 60000); Monitor.Wait(this, 60000);