diff options
author | Justin Clarke Casey | 2008-05-28 16:37:43 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-05-28 16:37:43 +0000 |
commit | 51a43b30a2f0cb76de26102064551816447a675c (patch) | |
tree | 1e6c452a12b8942181dc4fbc61a813716620ecdb /OpenSim/Region/Environment/Modules/World/Archiver/ArchiveRequest.cs | |
parent | remove terrain bloat, only keep last terrain revision (diff) | |
download | opensim-SC_OLD-51a43b30a2f0cb76de26102064551816447a675c.zip opensim-SC_OLD-51a43b30a2f0cb76de26102064551816447a675c.tar.gz opensim-SC_OLD-51a43b30a2f0cb76de26102064551816447a675c.tar.bz2 opensim-SC_OLD-51a43b30a2f0cb76de26102064551816447a675c.tar.xz |
* Put textures into a separate assets/ directory in the opensim archive
* Fix nre where the asset couldn't be found
* Not ready yet
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Archiver/ArchiveRequest.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/ArchiveRequest.cs | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveRequest.cs index ea74941..364b31f 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveRequest.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveRequest.cs | |||
@@ -106,10 +106,20 @@ namespace OpenSim.Region.Environment | |||
106 | TarArchive archive = new TarArchive(); | 106 | TarArchive archive = new TarArchive(); |
107 | 107 | ||
108 | archive.AddFile("prims.xml", m_serializedEntities); | 108 | archive.AddFile("prims.xml", m_serializedEntities); |
109 | |||
110 | // It appears that gtar, at least, doesn't need the intermediate directory entries in the tar | ||
111 | //archive.AddDir("assets"); | ||
109 | 112 | ||
110 | foreach (LLUUID uuid in assets.Keys) | 113 | foreach (LLUUID uuid in assets.Keys) |
111 | { | 114 | { |
112 | archive.AddFile(uuid.ToString() + ".jp2", assets[uuid].Data); | 115 | if (assets[uuid] != null) |
116 | { | ||
117 | archive.AddFile("assets/" + uuid.ToString() + ".jp2", assets[uuid].Data); | ||
118 | } | ||
119 | else | ||
120 | { | ||
121 | m_log.DebugFormat("[ARCHIVER]: Could not find asset {0} to archive", uuid); | ||
122 | } | ||
113 | } | 123 | } |
114 | 124 | ||
115 | archive.WriteTar(m_savePath); | 125 | archive.WriteTar(m_savePath); |