diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs index 3d7273e..199539b 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -37,7 +37,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
37 | /// Method called when all the necessary assets for an archive request have been received. | 37 | /// Method called when all the necessary assets for an archive request have been received. |
38 | /// </summary> | 38 | /// </summary> |
39 | public delegate void AssetsRequestCallback(IDictionary<LLUUID, AssetBase> assets); | 39 | public delegate void AssetsRequestCallback(IDictionary<LLUUID, AssetBase> assets); |
40 | 40 | ||
41 | /// <summary> | 41 | /// <summary> |
42 | /// Execute the write of an archive once we have received all the necessary data | 42 | /// Execute the write of an archive once we have received all the necessary data |
43 | /// </summary> | 43 | /// </summary> |
@@ -46,14 +46,14 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | 47 | ||
48 | protected string m_savePath; | 48 | protected string m_savePath; |
49 | protected string m_serializedEntities; | 49 | protected string m_serializedEntities; |
50 | 50 | ||
51 | public ArchiveWriteRequestExecution(string serializedEntities, string savePath) | 51 | public ArchiveWriteRequestExecution(string serializedEntities, string savePath) |
52 | { | 52 | { |
53 | m_serializedEntities = serializedEntities; | 53 | m_serializedEntities = serializedEntities; |
54 | m_savePath = savePath; | 54 | m_savePath = savePath; |
55 | } | 55 | } |
56 | 56 | ||
57 | protected internal void ReceivedAllAssets(IDictionary<LLUUID, AssetBase> assets) | 57 | protected internal void ReceivedAllAssets(IDictionary<LLUUID, AssetBase> assets) |
58 | { | 58 | { |
59 | m_log.DebugFormat("[ARCHIVER]: Received all {0} assets required", assets.Count); | 59 | m_log.DebugFormat("[ARCHIVER]: Received all {0} assets required", assets.Count); |
@@ -61,13 +61,13 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
61 | TarArchiveWriter archive = new TarArchiveWriter(); | 61 | TarArchiveWriter archive = new TarArchiveWriter(); |
62 | 62 | ||
63 | archive.AddFile(ArchiveConstants.PRIMS_PATH, m_serializedEntities); | 63 | archive.AddFile(ArchiveConstants.PRIMS_PATH, m_serializedEntities); |
64 | 64 | ||
65 | AssetsArchiver assetsArchiver = new AssetsArchiver(assets); | 65 | AssetsArchiver assetsArchiver = new AssetsArchiver(assets); |
66 | assetsArchiver.Archive(archive); | 66 | assetsArchiver.Archive(archive); |
67 | 67 | ||
68 | archive.WriteTar(m_savePath); | 68 | archive.WriteTar(m_savePath); |
69 | 69 | ||
70 | m_log.InfoFormat("[ARCHIVER]: Wrote out OpenSimulator archive {0}", m_savePath); | 70 | m_log.InfoFormat("[ARCHIVER]: Wrote out OpenSimulator archive {0}", m_savePath); |
71 | } | 71 | } |
72 | } | 72 | } |
73 | } | 73 | } |