aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-05-21 19:36:39 +0100
committerJustin Clark-Casey (justincc)2010-05-21 19:36:39 +0100
commit74ef1ed36f234d93aa3d58b1602344bcb3e00d6e (patch)
tree4d2cea7595c5ae54fc8eff50f541b4716660c256 /OpenSim/Framework
parentOnly send dialogs and notices to root agents, not child agents (diff)
downloadopensim-SC_OLD-74ef1ed36f234d93aa3d58b1602344bcb3e00d6e.zip
opensim-SC_OLD-74ef1ed36f234d93aa3d58b1602344bcb3e00d6e.tar.gz
opensim-SC_OLD-74ef1ed36f234d93aa3d58b1602344bcb3e00d6e.tar.bz2
opensim-SC_OLD-74ef1ed36f234d93aa3d58b1602344bcb3e00d6e.tar.xz
add prim item and test asset save in save oar unit test
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Serialization/TarArchiveWriter.cs7
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 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection;
31using System.Text; 32using System.Text;
33using log4net;
32 34
33namespace OpenSim.Framework.Serialization 35namespace 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)