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