OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add using into a few more places

0.9.1.0-post-fixes
UbitUmarov 2018-07-14 14:05:47 +01:00
parent d7a9195078
commit c7baee1638
2 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Capabilities/LLSD.cs
View File

@ -107,17 +107,17 @@ namespace OpenSim.Framework.Capabilities
/// <returns></returns> /// <returns></returns>
public static byte[] LLSDSerialize(object obj) public static byte[] LLSDSerialize(object obj)
{ {
StringWriter sw = new StringWriter(); using(StringWriter sw = new StringWriter())
XmlTextWriter writer = new XmlTextWriter(sw); using(XmlTextWriter writer = new XmlTextWriter(sw))
writer.Formatting = Formatting.None; {
writer.Formatting = Formatting.None;
writer.WriteStartElement(String.Empty, "llsd", String.Empty); writer.WriteStartElement(String.Empty, "llsd", String.Empty);
LLSDWriteOne(writer, obj); LLSDWriteOne(writer, obj);
writer.WriteEndElement(); writer.WriteEndElement();
writer.Flush();
writer.Close(); return Util.UTF8.GetBytes(sw.ToString());
}
return Util.UTF8.GetBytes(sw.ToString());
} }
/// <summary> /// <summary>

34
OpenSim/Capabilities/LLSDHelpers.cs
View File

@ -41,30 +41,32 @@ namespace OpenSim.Framework.Capabilities
public static string SerialiseLLSDReply(object obj) public static string SerialiseLLSDReply(object obj)
{ {
StringWriter sw = new StringWriter(); using(StringWriter sw = new StringWriter())
XmlTextWriter writer = new XmlTextWriter(sw); using(XmlTextWriter writer = new XmlTextWriter(sw))
writer.Formatting = Formatting.None; {
writer.WriteStartElement(String.Empty, "llsd", String.Empty); writer.Formatting = Formatting.None;
SerializeOSDType(writer, obj); writer.WriteStartElement(String.Empty, "llsd", String.Empty);
writer.WriteEndElement(); SerializeOSDType(writer, obj);
writer.Close(); writer.WriteEndElement();
writer.Flush();
//m_log.DebugFormat("[LLSD Helpers]: Generated serialized LLSD reply {0}", sw.ToString()); //m_log.DebugFormat("[LLSD Helpers]: Generated serialized LLSD reply {0}", sw.ToString());
return sw.ToString(); return sw.ToString();
}
} }
public static string SerialiseLLSDReplyNoHeader(object obj) public static string SerialiseLLSDReplyNoHeader(object obj)
{ {
StringWriter sw = new StringWriter(); using(StringWriter sw = new StringWriter())
XmlTextWriter writer = new XmlTextWriter(sw); using(XmlTextWriter writer = new XmlTextWriter(sw))
writer.Formatting = Formatting.None; {
SerializeOSDType(writer, obj); writer.Formatting = Formatting.None;
writer.Close(); SerializeOSDType(writer, obj);
writer.Flush();
//m_log.DebugFormat("[LLSD Helpers]: Generated serialized LLSD reply {0}", sw.ToString()); //m_log.DebugFormat("[LLSD Helpers]: Generated serialized LLSD reply {0}", sw.ToString());
return sw.ToString(); return sw.ToString();
}
} }
private static void SerializeOSDType(XmlTextWriter writer, object obj) private static void SerializeOSDType(XmlTextWriter writer, object obj)