ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix LocalPresenceServiceConnector test now that the hardcoded test data has been removed from Data.Null.NullPresenceData

Browse Source 
Unfortunately, this meant publicly exposing the underlying service for the connector.
The other solution would be to create alternative initializers for services and connectors where objects could be given directly rather than loaded indirectly through config.
Unfortunately, this would require a lot of work in this case but might be the better way forward.
This commit is contained in:
Justin Clark-Casey (justincc)
2010-03-05 00:54:46 +00:00
parent 8bd114b4df
commit e39fc95659
6 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Framework/SLUtil.cs
View File

@@ -1,11 +1,15 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using log4net;
using OpenMetaverse;
namespace OpenSim.Framework
{
public static class SLUtil
{
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
#region SL / file extension / content-type conversions
public static string SLAssetTypeToContentType(int assetType)
@@ -190,7 +194,12 @@ namespace OpenSim.Framework
/// <returns></returns>
public static string ParseNotecardToString(string rawInput)
{
return string.Join("\n", ParseNotecardToList(rawInput).ToArray());
string[] output = ParseNotecardToList(rawInput).ToArray();
// foreach (string line in output)
// m_log.DebugFormat("[PARSE NOTECARD]: ParseNotecardToString got line {0}", line);
return string.Join("\n", output);
}
/// <summary>
@@ -254,6 +263,7 @@ namespace OpenSim.Framework
if (ln.Length > need)
ln = ln.Substring(0, need);
// m_log.DebugFormat("[PARSE NOTECARD]: Adding line {0}", ln);
output.Add(ln);
count += ln.Length + 1;
idx++;