diff options
author | Justin Clarke Casey | 2008-06-05 00:01:38 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-06-05 00:01:38 +0000 |
commit | 7352bd7b992c36026876b4d1fb3e63f02aa984ec (patch) | |
tree | 6b7ba49cf4e820292f384f111f25121103633c1a /OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs | |
parent | * Dearchive using assets metadata rather than assuming everything is a texture (diff) | |
download | opensim-SC_OLD-7352bd7b992c36026876b4d1fb3e63f02aa984ec.zip opensim-SC_OLD-7352bd7b992c36026876b4d1fb3e63f02aa984ec.tar.gz opensim-SC_OLD-7352bd7b992c36026876b4d1fb3e63f02aa984ec.tar.bz2 opensim-SC_OLD-7352bd7b992c36026876b4d1fb3e63f02aa984ec.tar.xz |
* Change archiver 'textures' dir back to 'assets'
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs index 12e1f81..ed5f0e7 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs | |||
@@ -58,9 +58,6 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
58 | /// <param name="archive"></param> | 58 | /// <param name="archive"></param> |
59 | public void Archive(TarArchiveWriter archive) | 59 | public void Archive(TarArchiveWriter archive) |
60 | { | 60 | { |
61 | // It appears that gtar, at least, doesn't need the intermediate directory entries in the tar | ||
62 | //archive.AddDir("assets"); | ||
63 | |||
64 | WriteMetadata(archive); | 61 | WriteMetadata(archive); |
65 | WriteData(archive); | 62 | WriteData(archive); |
66 | } | 63 | } |
@@ -111,12 +108,15 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
111 | /// <param name="archive"></param> | 108 | /// <param name="archive"></param> |
112 | protected void WriteData(TarArchiveWriter archive) | 109 | protected void WriteData(TarArchiveWriter archive) |
113 | { | 110 | { |
111 | // It appears that gtar, at least, doesn't need the intermediate directory entries in the tar | ||
112 | //archive.AddDir("assets"); | ||
113 | |||
114 | foreach (LLUUID uuid in m_assets.Keys) | 114 | foreach (LLUUID uuid in m_assets.Keys) |
115 | { | 115 | { |
116 | if (m_assets[uuid] != null) | 116 | if (m_assets[uuid] != null) |
117 | { | 117 | { |
118 | archive.AddFile( | 118 | archive.AddFile( |
119 | ArchiveConstants.TEXTURES_PATH + uuid.ToString() + ArchiveConstants.TEXTURE_EXTENSION, | 119 | ArchiveConstants.ASSETS_PATH + uuid.ToString() + ArchiveConstants.TEXTURE_EXTENSION, |
120 | m_assets[uuid].Data); | 120 | m_assets[uuid].Data); |
121 | } | 121 | } |
122 | else | 122 | else |