aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/SLUtil.cs12
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Framework/SLUtil.cs b/OpenSim/Framework/SLUtil.cs
index ff5f8b9..81d82be 100644
--- a/OpenSim/Framework/SLUtil.cs
+++ b/OpenSim/Framework/SLUtil.cs
@@ -1,11 +1,15 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Reflection;
4using log4net;
3using OpenMetaverse; 5using OpenMetaverse;
4 6
5namespace OpenSim.Framework 7namespace OpenSim.Framework
6{ 8{
7 public static class SLUtil 9 public static class SLUtil
8 { 10 {
11// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
12
9 #region SL / file extension / content-type conversions 13 #region SL / file extension / content-type conversions
10 14
11 public static string SLAssetTypeToContentType(int assetType) 15 public static string SLAssetTypeToContentType(int assetType)
@@ -190,7 +194,12 @@ namespace OpenSim.Framework
190 /// <returns></returns> 194 /// <returns></returns>
191 public static string ParseNotecardToString(string rawInput) 195 public static string ParseNotecardToString(string rawInput)
192 { 196 {
193 return string.Join("\n", ParseNotecardToList(rawInput).ToArray()); 197 string[] output = ParseNotecardToList(rawInput).ToArray();
198
199// foreach (string line in output)
200// m_log.DebugFormat("[PARSE NOTECARD]: ParseNotecardToString got line {0}", line);
201
202 return string.Join("\n", output);
194 } 203 }
195 204
196 /// <summary> 205 /// <summary>
@@ -254,6 +263,7 @@ namespace OpenSim.Framework
254 if (ln.Length > need) 263 if (ln.Length > need)
255 ln = ln.Substring(0, need); 264 ln = ln.Substring(0, need);
256 265
266// m_log.DebugFormat("[PARSE NOTECARD]: Adding line {0}", ln);
257 output.Add(ln); 267 output.Add(ln);
258 count += ln.Length + 1; 268 count += ln.Length + 1;
259 idx++; 269 idx++;