diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs index accf7e4..a6ad24c 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | |||
@@ -50,14 +50,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
50 | 50 | ||
51 | protected Scene m_scene; | 51 | protected Scene m_scene; |
52 | protected Stream m_saveStream; | 52 | protected Stream m_saveStream; |
53 | protected Guid m_requestId; | ||
53 | 54 | ||
54 | /// <summary> | 55 | /// <summary> |
55 | /// Constructor | 56 | /// Constructor |
56 | /// </summary> | 57 | /// </summary> |
57 | public ArchiveWriteRequestPreparation(Scene scene, string savePath) | 58 | public ArchiveWriteRequestPreparation(Scene scene, string savePath, Guid requestId) |
58 | { | 59 | { |
59 | m_scene = scene; | 60 | m_scene = scene; |
60 | m_saveStream = new GZipStream(new FileStream(savePath, FileMode.Create), CompressionMode.Compress); | 61 | m_saveStream = new GZipStream(new FileStream(savePath, FileMode.Create), CompressionMode.Compress); |
62 | m_requestId = requestId; | ||
61 | } | 63 | } |
62 | 64 | ||
63 | /// <summary> | 65 | /// <summary> |
@@ -65,10 +67,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
65 | /// </summary> | 67 | /// </summary> |
66 | /// <param name="scene"></param> | 68 | /// <param name="scene"></param> |
67 | /// <param name="saveStream">The stream to which to save data.</param> | 69 | /// <param name="saveStream">The stream to which to save data.</param> |
68 | public ArchiveWriteRequestPreparation(Scene scene, Stream saveStream) | 70 | /// <param name="requestId">The id associated with this request</param> |
71 | public ArchiveWriteRequestPreparation(Scene scene, Stream saveStream, Guid requestId) | ||
69 | { | 72 | { |
70 | m_scene = scene; | 73 | m_scene = scene; |
71 | m_saveStream = saveStream; | 74 | m_saveStream = saveStream; |
75 | m_requestId = requestId; | ||
72 | } | 76 | } |
73 | 77 | ||
74 | /// <summary> | 78 | /// <summary> |
@@ -129,7 +133,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
129 | m_scene.RequestModuleInterface<ITerrainModule>(), | 133 | m_scene.RequestModuleInterface<ITerrainModule>(), |
130 | m_scene.RequestModuleInterface<IRegionSerialiserModule>(), | 134 | m_scene.RequestModuleInterface<IRegionSerialiserModule>(), |
131 | m_scene, | 135 | m_scene, |
132 | m_saveStream); | 136 | m_saveStream, |
137 | m_requestId); | ||
133 | 138 | ||
134 | new AssetsRequest(assetUuids.Keys, m_scene.CommsManager.AssetCache, awre.ReceivedAllAssets).Execute(); | 139 | new AssetsRequest(assetUuids.Keys, m_scene.CommsManager.AssetCache, awre.ReceivedAllAssets).Execute(); |
135 | } | 140 | } |