aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-05-30 16:08:28 +0000
committerJustin Clarke Casey2008-05-30 16:08:28 +0000
commitea4982e4532f0cd2b793375f2c9f54c3c389c552 (patch)
tree9f4c271ef83571b2ac8ff516868297d882156f69 /OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs
parentMantis#1422. Thank you kindly, Xantor for a patch that : (diff)
downloadopensim-SC_OLD-ea4982e4532f0cd2b793375f2c9f54c3c389c552.zip
opensim-SC_OLD-ea4982e4532f0cd2b793375f2c9f54c3c389c552.tar.gz
opensim-SC_OLD-ea4982e4532f0cd2b793375f2c9f54c3c389c552.tar.bz2
opensim-SC_OLD-ea4982e4532f0cd2b793375f2c9f54c3c389c552.tar.xz
* Successfully pick out prims.xml file from archive
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs
index 576286d..d936df5 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs
@@ -36,7 +36,7 @@ using libsecondlife;
36using log4net; 36using log4net;
37using Nini.Config; 37using Nini.Config;
38 38
39namespace OpenSim.Region.Environment 39namespace OpenSim.Region.Environment.Modules.World.Archiver
40{ 40{
41 /// <summary> 41 /// <summary>
42 /// Method called when all the necessary assets for an archive request have been received. 42 /// Method called when all the necessary assets for an archive request have been received.
@@ -103,7 +103,7 @@ namespace OpenSim.Region.Environment
103 103
104 TarArchiveWriter archive = new TarArchiveWriter(); 104 TarArchiveWriter archive = new TarArchiveWriter();
105 105
106 archive.AddFile("prims.xml", m_serializedEntities); 106 archive.AddFile(ArchiveConstants.PRIMS_PATH, m_serializedEntities);
107 107
108 // It appears that gtar, at least, doesn't need the intermediate directory entries in the tar 108 // It appears that gtar, at least, doesn't need the intermediate directory entries in the tar
109 //archive.AddDir("assets"); 109 //archive.AddDir("assets");
@@ -112,7 +112,7 @@ namespace OpenSim.Region.Environment
112 { 112 {
113 if (assets[uuid] != null) 113 if (assets[uuid] != null)
114 { 114 {
115 archive.AddFile("assets/" + uuid.ToString() + ".jp2", assets[uuid].Data); 115 archive.AddFile(ArchiveConstants.ASSETS_PATH + uuid.ToString() + ".jp2", assets[uuid].Data);
116 } 116 }
117 else 117 else
118 { 118 {