ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-13 13:15:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove duplicated serialization code

Browse Source
This commit is contained in:
Justin Clark-Casey (justincc)
2010-08-03 15:58:17 +01:00
parent 60df76314f
commit ac07d853b8
2 changed files with 29 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
OpenSim/Framework/PrimitiveBaseShape.cs
View File

@@ -1238,7 +1238,7 @@ namespace OpenSim.Framework
return null;
}
public void WriteXml(XmlWriter writer)
public string ToXml()
{
lock (this)
{
@@ -1265,18 +1265,26 @@ namespace OpenSim.Framework
xtw.WriteEndElement();
xtw.Flush();
writer.WriteRaw(sw.ToString());
return sw.ToString();
}
}
}
}
}
public void ReadXml(XmlReader reader)
public void WriteXml(XmlWriter writer)
{
writer.WriteRaw(ToXml());
}
public static MediaList FromXml(string rawXml)
{
if (reader.IsEmptyElement)
return;
string rawXml = reader.ReadInnerXml();
MediaList ml = new MediaList();
ml.ReadXml(rawXml);
return ml;
}
public void ReadXml(string rawXml)
{
using (StringReader sr = new StringReader(rawXml))
{
using (XmlTextReader xtr = new XmlTextReader(sr))
@@ -1292,8 +1300,6 @@ namespace OpenSim.Framework
xtr.ReadStartElement("osmedia");
OSDArray osdMeArray = (OSDArray)OSDParser.DeserializeLLSDXml(xtr.ReadInnerXml());
List<MediaEntry> mediaEntries = new List<MediaEntry>();
foreach (OSD osdMe in osdMeArray)
{
MediaEntry me = (osdMe is OSDMap ? MediaEntry.FromOSD(osdMe) : new MediaEntry());
@@ -1303,7 +1309,15 @@ namespace OpenSim.Framework
xtr.ReadEndElement();
}
}
}
}
public void ReadXml(XmlReader reader)
{
if (reader.IsEmptyElement)
return;
ReadXml(reader.ReadInnerXml());
}
}
}
}