aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs7
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
index 09776a7..bd58e7c 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
@@ -94,11 +94,13 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
94 94
95 byte[] data; 95 byte[] data;
96 TarArchiveReader.TarEntryType entryType; 96 TarArchiveReader.TarEntryType entryType;
97
97 while ((data = archive.ReadEntry(out filePath, out entryType)) != null) 98 while ((data = archive.ReadEntry(out filePath, out entryType)) != null)
98 { 99 {
99 //m_log.DebugFormat( 100 //m_log.DebugFormat(
100 // "[ARCHIVER]: Successfully read {0} ({1} bytes)}", filePath, data.Length); 101 // "[ARCHIVER]: Successfully read {0} ({1} bytes)}", filePath, data.Length);
101 if (entryType==TarArchiveReader.TarEntryType.TYPE_DIRECTORY) { 102 if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType)
103 {
102 m_log.WarnFormat("[ARCHIVER]: Ignoring directory entry {0}", 104 m_log.WarnFormat("[ARCHIVER]: Ignoring directory entry {0}",
103 filePath); 105 filePath);
104 } 106 }
@@ -407,7 +409,6 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
407 409
408 private static Stream URIFetch(Uri uri) 410 private static Stream URIFetch(Uri uri)
409 { 411 {
410
411 HttpWebRequest request = (HttpWebRequest) WebRequest.Create(uri); 412 HttpWebRequest request = (HttpWebRequest) WebRequest.Create(uri);
412 413
413 // request.Credentials = credentials; 414 // request.Credentials = credentials;
@@ -425,8 +426,6 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
425 426
426 // return new BufferedStream(file, (int) response.ContentLength); 427 // return new BufferedStream(file, (int) response.ContentLength);
427 return new BufferedStream(file, 1000000); 428 return new BufferedStream(file, 1000000);
428
429 } 429 }
430
431 } 430 }
432} 431}