diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs index 6c341c6..41f230c 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs | |||
@@ -123,23 +123,9 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
123 | TarArchiveWriter archive = new TarArchiveWriter(); | 123 | TarArchiveWriter archive = new TarArchiveWriter(); |
124 | 124 | ||
125 | archive.AddFile(ArchiveConstants.PRIMS_PATH, m_serializedEntities); | 125 | archive.AddFile(ArchiveConstants.PRIMS_PATH, m_serializedEntities); |
126 | 126 | ||
127 | // It appears that gtar, at least, doesn't need the intermediate directory entries in the tar | 127 | AssetsArchiver assetsArchiver = new AssetsArchiver(assets); |
128 | //archive.AddDir("assets"); | 128 | assetsArchiver.Archive(archive); |
129 | |||
130 | foreach (LLUUID uuid in assets.Keys) | ||
131 | { | ||
132 | if (assets[uuid] != null) | ||
133 | { | ||
134 | archive.AddFile( | ||
135 | ArchiveConstants.TEXTURES_PATH + uuid.ToString() + ArchiveConstants.TEXTURE_EXTENSION, | ||
136 | assets[uuid].Data); | ||
137 | } | ||
138 | else | ||
139 | { | ||
140 | m_log.DebugFormat("[ARCHIVER]: Could not find asset {0} to archive", uuid); | ||
141 | } | ||
142 | } | ||
143 | 129 | ||
144 | archive.WriteTar(m_savePath); | 130 | archive.WriteTar(m_savePath); |
145 | 131 | ||