aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-04-28 19:54:57 +0000
committerJustin Clarke Casey2009-04-28 19:54:57 +0000
commitcac6971099c361300d67add19c510a06145f6a1a (patch)
tree75cdc6b4af9de7f37793ad49eb052011e3f6aea2 /OpenSim/Region
parent* Stop oar loading barfing if the archive contains directory entries (diff)
downloadopensim-SC_OLD-cac6971099c361300d67add19c510a06145f6a1a.zip
opensim-SC_OLD-cac6971099c361300d67add19c510a06145f6a1a.tar.gz
opensim-SC_OLD-cac6971099c361300d67add19c510a06145f6a1a.tar.bz2
opensim-SC_OLD-cac6971099c361300d67add19c510a06145f6a1a.tar.xz
* Get rid of some extraneous debug log output from the last commit
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs4
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 7f7986d..bf844ad 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -110,8 +110,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
110 110
111 while ((data = archive.ReadEntry(out filePath, out entryType)) != null) 111 while ((data = archive.ReadEntry(out filePath, out entryType)) != null)
112 { 112 {
113 m_log.DebugFormat( 113 //m_log.DebugFormat(
114 "[ARCHIVER]: Successfully read {0} ({1} bytes)", filePath, data.Length); 114 // "[ARCHIVER]: Successfully read {0} ({1} bytes)", filePath, data.Length);
115 115
116 if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType) 116 if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType)
117 continue; 117 continue;
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index 09ff9a2..af789aa 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
79 [Test] 79 [Test]
80 public void TestSaveOarV0p2() 80 public void TestSaveOarV0p2()
81 { 81 {
82 log4net.Config.XmlConfigurator.Configure(); 82 //log4net.Config.XmlConfigurator.Configure();
83 83
84 ArchiverModule archiverModule = new ArchiverModule(); 84 ArchiverModule archiverModule = new ArchiverModule();
85 SerialiserModule serialiserModule = new SerialiserModule(); 85 SerialiserModule serialiserModule = new SerialiserModule();
@@ -202,7 +202,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
202 [Test] 202 [Test]
203 public void TestLoadOarV0p2() 203 public void TestLoadOarV0p2()
204 { 204 {
205 log4net.Config.XmlConfigurator.Configure(); 205 //log4net.Config.XmlConfigurator.Configure();
206 206
207 MemoryStream archiveWriteStream = new MemoryStream(); 207 MemoryStream archiveWriteStream = new MemoryStream();
208 TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream); 208 TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);