From 1d745cca1753ee62a75633029adeb3abfb9b224a Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Wed, 4 Jun 2008 18:50:58 +0000
Subject: * Start writing out assets metadata file for archiver * Ignoring it
 on reload as of yet

---
 .../Modules/World/Archiver/ArchiveWriteRequest.cs    | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs')

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
             TarArchiveWriter archive = new TarArchiveWriter();
 
             archive.AddFile(ArchiveConstants.PRIMS_PATH, m_serializedEntities);
-
-            // It appears that gtar, at least, doesn't need the intermediate directory entries in the tar
-            //archive.AddDir("assets");
-
-            foreach (LLUUID uuid in assets.Keys)
-            {
-                if (assets[uuid] != null)
-                {
-                    archive.AddFile(
-                        ArchiveConstants.TEXTURES_PATH + uuid.ToString() + ArchiveConstants.TEXTURE_EXTENSION,
-                        assets[uuid].Data);
-                }
-                else
-                {
-                    m_log.DebugFormat("[ARCHIVER]: Could not find asset {0} to archive", uuid);
-                }
-            }
+            
+            AssetsArchiver assetsArchiver = new AssetsArchiver(assets);
+            assetsArchiver.Archive(archive);
 
             archive.WriteTar(m_savePath);
 
-- 
cgit v1.1