diff options
author | Justin Clarke Casey | 2009-01-30 20:54:38 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-01-30 20:54:38 +0000 |
commit | c307e0e4a7ddf0b07f2b0662fe55adc31b64b393 (patch) | |
tree | 3206f4a7aa0d00ad5256599eb457de0ce608fcc6 /OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs | |
parent | * furhter simplify test setups for objects (diff) | |
download | opensim-SC_OLD-c307e0e4a7ddf0b07f2b0662fe55adc31b64b393.zip opensim-SC_OLD-c307e0e4a7ddf0b07f2b0662fe55adc31b64b393.tar.gz opensim-SC_OLD-c307e0e4a7ddf0b07f2b0662fe55adc31b64b393.tar.bz2 opensim-SC_OLD-c307e0e4a7ddf0b07f2b0662fe55adc31b64b393.tar.xz |
* Extend archive save test to check for the presence of the file for the object that was in the scene
* Can now pass in a wait handle to ArchiveRegion() if you want same thread signalling that the save has completed
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs index f07185c..e3dfda2 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs | |||
@@ -28,6 +28,7 @@ | |||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using System.Threading; | ||
31 | using OpenMetaverse; | 32 | using OpenMetaverse; |
32 | using log4net; | 33 | using log4net; |
33 | using Nini.Config; | 34 | using Nini.Config; |
@@ -72,9 +73,9 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
72 | new ArchiveWriteRequestPreparation(m_scene, savePath).ArchiveRegion(); | 73 | new ArchiveWriteRequestPreparation(m_scene, savePath).ArchiveRegion(); |
73 | } | 74 | } |
74 | 75 | ||
75 | public void ArchiveRegion(Stream saveStream) | 76 | public void ArchiveRegion(Stream saveStream, EventWaitHandle waitHandle) |
76 | { | 77 | { |
77 | new ArchiveWriteRequestPreparation(m_scene, saveStream).ArchiveRegion(); | 78 | new ArchiveWriteRequestPreparation(m_scene, saveStream, waitHandle).ArchiveRegion(); |
78 | } | 79 | } |
79 | 80 | ||
80 | public void DearchiveRegion(string loadPath) | 81 | public void DearchiveRegion(string loadPath) |