diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs index e9005ae..b3c9a91 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs | |||
@@ -53,6 +53,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
53 | 53 | ||
54 | protected Scene m_scene; | 54 | protected Scene m_scene; |
55 | protected Stream m_saveStream; | 55 | protected Stream m_saveStream; |
56 | protected EventWaitHandle m_signalWhenDoneEvent; | ||
56 | 57 | ||
57 | /// <summary> | 58 | /// <summary> |
58 | /// Used as a temporary store of an asset which represents an object. This can be a null if no appropriate | 59 | /// Used as a temporary store of an asset which represents an object. This can be a null if no appropriate |
@@ -79,10 +80,11 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
79 | /// </summary> | 80 | /// </summary> |
80 | /// <param name="scene"></param> | 81 | /// <param name="scene"></param> |
81 | /// <param name="saveStream">The stream to which to save data.</param> | 82 | /// <param name="saveStream">The stream to which to save data.</param> |
82 | public ArchiveWriteRequestPreparation(Scene scene, Stream saveStream) | 83 | public ArchiveWriteRequestPreparation(Scene scene, Stream saveStream, EventWaitHandle signalWhenDoneEvent) |
83 | { | 84 | { |
84 | m_scene = scene; | 85 | m_scene = scene; |
85 | m_saveStream = saveStream; | 86 | m_saveStream = saveStream; |
87 | m_signalWhenDoneEvent = signalWhenDoneEvent; | ||
86 | } | 88 | } |
87 | 89 | ||
88 | /// <summary> | 90 | /// <summary> |
@@ -325,7 +327,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
325 | m_scene.RequestModuleInterface<ITerrainModule>(), | 327 | m_scene.RequestModuleInterface<ITerrainModule>(), |
326 | m_scene.RequestModuleInterface<IRegionSerialiserModule>(), | 328 | m_scene.RequestModuleInterface<IRegionSerialiserModule>(), |
327 | m_scene.RegionInfo, | 329 | m_scene.RegionInfo, |
328 | m_saveStream); | 330 | m_saveStream, |
331 | m_signalWhenDoneEvent); | ||
329 | 332 | ||
330 | new AssetsRequest(assetUuids.Keys, m_scene.AssetCache, awre.ReceivedAllAssets).Execute(); | 333 | new AssetsRequest(assetUuids.Keys, m_scene.AssetCache, awre.ReceivedAllAssets).Execute(); |
331 | } | 334 | } |