Minor formatting cleanup.
parent
0d29614ca1
commit
0a259caeef
|
@ -41,7 +41,7 @@ namespace OpenSim.Framework.Serialization.External
|
||||||
public class LandDataSerializer
|
public class LandDataSerializer
|
||||||
{
|
{
|
||||||
protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding();
|
protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Reify/deserialize landData
|
/// Reify/deserialize landData
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -52,7 +52,7 @@ namespace OpenSim.Framework.Serialization.External
|
||||||
{
|
{
|
||||||
return Deserialize(m_utf8Encoding.GetString(serializedLandData, 0, serializedLandData.Length));
|
return Deserialize(m_utf8Encoding.GetString(serializedLandData, 0, serializedLandData.Length));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Reify/deserialize landData
|
/// Reify/deserialize landData
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -62,10 +62,10 @@ namespace OpenSim.Framework.Serialization.External
|
||||||
public static LandData Deserialize(string serializedLandData)
|
public static LandData Deserialize(string serializedLandData)
|
||||||
{
|
{
|
||||||
LandData landData = new LandData();
|
LandData landData = new LandData();
|
||||||
|
|
||||||
StringReader sr = new StringReader(serializedLandData);
|
StringReader sr = new StringReader(serializedLandData);
|
||||||
XmlTextReader xtr = new XmlTextReader(sr);
|
XmlTextReader xtr = new XmlTextReader(sr);
|
||||||
|
|
||||||
xtr.ReadStartElement("LandData");
|
xtr.ReadStartElement("LandData");
|
||||||
|
|
||||||
landData.Area = Convert.ToInt32( xtr.ReadElementString("Area"));
|
landData.Area = Convert.ToInt32( xtr.ReadElementString("Area"));
|
||||||
|
@ -106,7 +106,7 @@ namespace OpenSim.Framework.Serialization.External
|
||||||
pae.Time = Convert.ToDateTime( xtr.ReadElementString("Time"));
|
pae.Time = Convert.ToDateTime( xtr.ReadElementString("Time"));
|
||||||
pae.Flags = (AccessList)Convert.ToUInt32( xtr.ReadElementString("AccessList"));
|
pae.Flags = (AccessList)Convert.ToUInt32( xtr.ReadElementString("AccessList"));
|
||||||
xtr.ReadEndElement();
|
xtr.ReadEndElement();
|
||||||
|
|
||||||
landData.ParcelAccessList.Add(pae);
|
landData.ParcelAccessList.Add(pae);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -122,13 +122,13 @@ namespace OpenSim.Framework.Serialization.External
|
||||||
landData.OtherCleanTime = Convert.ToInt32( xtr.ReadElementString("OtherCleanTime"));
|
landData.OtherCleanTime = Convert.ToInt32( xtr.ReadElementString("OtherCleanTime"));
|
||||||
|
|
||||||
xtr.ReadEndElement();
|
xtr.ReadEndElement();
|
||||||
|
|
||||||
xtr.Close();
|
xtr.Close();
|
||||||
sr.Close();
|
sr.Close();
|
||||||
|
|
||||||
return landData;
|
return landData;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string Serialize(LandData landData)
|
public static string Serialize(LandData landData)
|
||||||
{
|
{
|
||||||
StringWriter sw = new StringWriter();
|
StringWriter sw = new StringWriter();
|
||||||
|
@ -137,8 +137,8 @@ namespace OpenSim.Framework.Serialization.External
|
||||||
|
|
||||||
xtw.WriteStartDocument();
|
xtw.WriteStartDocument();
|
||||||
xtw.WriteStartElement("LandData");
|
xtw.WriteStartElement("LandData");
|
||||||
|
|
||||||
xtw.WriteElementString("Area", Convert.ToString(landData.Area));
|
xtw.WriteElementString("Area", Convert.ToString(landData.Area));
|
||||||
xtw.WriteElementString("AuctionID", Convert.ToString(landData.AuctionID));
|
xtw.WriteElementString("AuctionID", Convert.ToString(landData.AuctionID));
|
||||||
xtw.WriteElementString("AuthBuyerID", landData.AuthBuyerID.ToString());
|
xtw.WriteElementString("AuthBuyerID", landData.AuthBuyerID.ToString());
|
||||||
xtw.WriteElementString("Category", Convert.ToString((sbyte)landData.Category));
|
xtw.WriteElementString("Category", Convert.ToString((sbyte)landData.Category));
|
||||||
|
@ -170,7 +170,7 @@ namespace OpenSim.Framework.Serialization.External
|
||||||
xtw.WriteEndElement();
|
xtw.WriteEndElement();
|
||||||
}
|
}
|
||||||
xtw.WriteEndElement();
|
xtw.WriteEndElement();
|
||||||
|
|
||||||
xtw.WriteElementString("PassHours", Convert.ToString(landData.PassHours));
|
xtw.WriteElementString("PassHours", Convert.ToString(landData.PassHours));
|
||||||
xtw.WriteElementString("PassPrice", Convert.ToString(landData.PassPrice));
|
xtw.WriteElementString("PassPrice", Convert.ToString(landData.PassPrice));
|
||||||
xtw.WriteElementString("SalePrice", Convert.ToString(landData.SalePrice));
|
xtw.WriteElementString("SalePrice", Convert.ToString(landData.SalePrice));
|
||||||
|
@ -184,7 +184,7 @@ namespace OpenSim.Framework.Serialization.External
|
||||||
|
|
||||||
xtw.Close();
|
xtw.Close();
|
||||||
sw.Close();
|
sw.Close();
|
||||||
|
|
||||||
return sw.ToString();
|
return sw.ToString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue