diff options
author | Justin Clarke Casey | 2008-05-28 17:49:34 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-05-28 17:49:34 +0000 |
commit | fb91a1aa49c098d03989a931280eaf668dceef18 (patch) | |
tree | 15dc2b18eaa7fac353d07eda7a6bf21fce1cfd64 /OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs | |
parent | spring cleaning, remove a bit of db4o grid server (diff) | |
download | opensim-SC_OLD-fb91a1aa49c098d03989a931280eaf668dceef18.zip opensim-SC_OLD-fb91a1aa49c098d03989a931280eaf668dceef18.tar.gz opensim-SC_OLD-fb91a1aa49c098d03989a931280eaf668dceef18.tar.bz2 opensim-SC_OLD-fb91a1aa49c098d03989a931280eaf668dceef18.tar.xz |
* Put in stubs for "load-oar" command, including ultra-primitive temporary tar loading code
* Currently as a test, this will successfully load only the first file of an opensim archive and do absolutely nothing with it
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs (renamed from OpenSim/Region/Environment/Modules/World/Archiver/ArchiveRequest.cs) | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs index 364b31f..b952200 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveRequest.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs | |||
@@ -44,9 +44,9 @@ namespace OpenSim.Region.Environment | |||
44 | public delegate void AssetsRequestCallback(IDictionary<LLUUID, AssetBase> assets); | 44 | public delegate void AssetsRequestCallback(IDictionary<LLUUID, AssetBase> assets); |
45 | 45 | ||
46 | /// <summary> | 46 | /// <summary> |
47 | /// Handles an individual archive request | 47 | /// Handles an individual archive write request |
48 | /// </summary> | 48 | /// </summary> |
49 | public class ArchiveRequest | 49 | public class ArchiveWriteRequest |
50 | { | 50 | { |
51 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 51 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
52 | 52 | ||
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Environment | |||
55 | 55 | ||
56 | private string m_serializedEntities; | 56 | private string m_serializedEntities; |
57 | 57 | ||
58 | public ArchiveRequest(Scene scene, string savePath) | 58 | public ArchiveWriteRequest(Scene scene, string savePath) |
59 | { | 59 | { |
60 | m_scene = scene; | 60 | m_scene = scene; |
61 | m_savePath = savePath; | 61 | m_savePath = savePath; |
@@ -65,8 +65,6 @@ namespace OpenSim.Region.Environment | |||
65 | 65 | ||
66 | protected void ArchiveRegion() | 66 | protected void ArchiveRegion() |
67 | { | 67 | { |
68 | m_log.Warn("[ARCHIVER]: Archive region not yet implemented"); | ||
69 | |||
70 | Dictionary<LLUUID, int> textureUuids = new Dictionary<LLUUID, int>(); | 68 | Dictionary<LLUUID, int> textureUuids = new Dictionary<LLUUID, int>(); |
71 | 69 | ||
72 | List<EntityBase> entities = m_scene.GetEntities(); | 70 | List<EntityBase> entities = m_scene.GetEntities(); |
@@ -103,7 +101,7 @@ namespace OpenSim.Region.Environment | |||
103 | 101 | ||
104 | // XXX: Shouldn't hijack the asset async callback thread like this - this is only temporary | 102 | // XXX: Shouldn't hijack the asset async callback thread like this - this is only temporary |
105 | 103 | ||
106 | TarArchive archive = new TarArchive(); | 104 | TarArchiveWriter archive = new TarArchiveWriter(); |
107 | 105 | ||
108 | archive.AddFile("prims.xml", m_serializedEntities); | 106 | archive.AddFile("prims.xml", m_serializedEntities); |
109 | 107 | ||