diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs index a5b5917..73fd916 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -88,12 +88,16 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
88 | int failedAssetRestores = 0; | 88 | int failedAssetRestores = 0; |
89 | 89 | ||
90 | byte[] data; | 90 | byte[] data; |
91 | while ((data = archive.ReadEntry(out filePath)) != null) | 91 | TarArchiveReader.TarEntryType entryType; |
92 | while ((data = archive.ReadEntry(out filePath, out entryType)) != null) | ||
92 | { | 93 | { |
93 | //m_log.DebugFormat( | 94 | //m_log.DebugFormat( |
94 | // "[ARCHIVER]: Successfully read {0} ({1} bytes)}", filePath, data.Length); | 95 | // "[ARCHIVER]: Successfully read {0} ({1} bytes)}", filePath, data.Length); |
95 | 96 | if (entryType==TarArchiveReader.TarEntryType.TYPE_DIRECTORY) { | |
96 | if (filePath.StartsWith(ArchiveConstants.OBJECTS_PATH)) | 97 | m_log.WarnFormat("[ARCHIVER]: Ignoring directory entry {0}", |
98 | filePath); | ||
99 | } | ||
100 | else if (filePath.StartsWith(ArchiveConstants.OBJECTS_PATH)) | ||
97 | { | 101 | { |
98 | serialisedSceneObjects.Add(m_asciiEncoding.GetString(data)); | 102 | serialisedSceneObjects.Add(m_asciiEncoding.GetString(data)); |
99 | } | 103 | } |