diff options
| author | UbitUmarov | 2015-11-22 08:00:58 +0000 |
|---|---|---|
| committer | UbitUmarov | 2015-11-22 08:00:58 +0000 |
| commit | 1de096dffbb24fc7a92f27fdbd212231a4b5cefd (patch) | |
| tree | 351fd511ffc93bc668b8eebd368ab83340509ecc /OpenSim/Region | |
| parent | take the Monitor.wait out of the locks (diff) | |
| download | opensim-SC-1de096dffbb24fc7a92f27fdbd212231a4b5cefd.zip opensim-SC-1de096dffbb24fc7a92f27fdbd212231a4b5cefd.tar.gz opensim-SC-1de096dffbb24fc7a92f27fdbd212231a4b5cefd.tar.bz2 opensim-SC-1de096dffbb24fc7a92f27fdbd212231a4b5cefd.tar.xz | |
coment out merge option on multiregion oar load i added
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
| 1022 | { | 1022 | { |
| 1023 | m_scene.EventManager.OnOarFileLoaded += LoadCompleted; | 1023 | m_scene.EventManager.OnOarFileLoaded += LoadCompleted; |
| 1024 | Dictionary<string, object> archiveOptions = new Dictionary<string, object>(); | 1024 | Dictionary<string, object> archiveOptions = new Dictionary<string, object>(); |
| 1025 | archiveOptions.Add("merge", null); | 1025 | // archiveOptions.Add("merge", null); |
| 1026 | m_archiverModule.DearchiveRegion(archiveReadStream, Guid.Empty, archiveOptions); | 1026 | m_archiverModule.DearchiveRegion(archiveReadStream, Guid.Empty, archiveOptions); |
| 1027 | } | 1027 | } |
| 1028 | Monitor.Wait(this, 60000); | 1028 | Monitor.Wait(this, 60000); |