diff options
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Serialization/TarArchiveWriter.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Framework/Serialization/TarArchiveWriter.cs b/OpenSim/Framework/Serialization/TarArchiveWriter.cs index 0bd639f..fca909f 100644 --- a/OpenSim/Framework/Serialization/TarArchiveWriter.cs +++ b/OpenSim/Framework/Serialization/TarArchiveWriter.cs | |||
@@ -28,7 +28,9 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | 30 | using System.IO; |
31 | using System.Reflection; | ||
31 | using System.Text; | 32 | using System.Text; |
33 | using log4net; | ||
32 | 34 | ||
33 | namespace OpenSim.Framework.Serialization | 35 | namespace OpenSim.Framework.Serialization |
34 | { | 36 | { |
@@ -37,7 +39,7 @@ namespace OpenSim.Framework.Serialization | |||
37 | /// </summary> | 39 | /// </summary> |
38 | public class TarArchiveWriter | 40 | public class TarArchiveWriter |
39 | { | 41 | { |
40 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 42 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
41 | 43 | ||
42 | protected static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding(); | 44 | protected static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding(); |
43 | protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding(); | 45 | protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding(); |
@@ -148,6 +150,9 @@ namespace OpenSim.Framework.Serialization | |||
148 | /// <param name="fileType"></param> | 150 | /// <param name="fileType"></param> |
149 | protected void WriteEntry(string filePath, byte[] data, char fileType) | 151 | protected void WriteEntry(string filePath, byte[] data, char fileType) |
150 | { | 152 | { |
153 | // m_log.DebugFormat( | ||
154 | // "[TAR ARCHIVE WRITER]: Data for {0} is {1} bytes", filePath, (null == data ? "null" : data.Length.ToString())); | ||
155 | |||
151 | byte[] header = new byte[512]; | 156 | byte[] header = new byte[512]; |
152 | 157 | ||
153 | // file path field (100) | 158 | // file path field (100) |