aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-30 20:54:38 +0000
committerJustin Clarke Casey2009-01-30 20:54:38 +0000
commitc307e0e4a7ddf0b07f2b0662fe55adc31b64b393 (patch)
tree3206f4a7aa0d00ad5256599eb457de0ce608fcc6 /OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs
parent* furhter simplify test setups for objects (diff)
downloadopensim-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.cs5
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 @@
28using System.Collections.Generic; 28using System.Collections.Generic;
29using System.IO; 29using System.IO;
30using System.Reflection; 30using System.Reflection;
31using System.Threading;
31using OpenMetaverse; 32using OpenMetaverse;
32using log4net; 33using log4net;
33using Nini.Config; 34using 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)