Couple of small changes to Xml serialising of SceneObjectGroups (shouldn't effect anything).
parent
58ef357cbf
commit
0f1604a53f
|
@ -271,18 +271,18 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
XmlTextReader reader = new XmlTextReader(sr);
|
XmlTextReader reader = new XmlTextReader(sr);
|
||||||
reader.Read();
|
reader.Read();
|
||||||
reader.ReadStartElement("SceneObjectGroup");
|
reader.ReadStartElement("SceneObjectGroup");
|
||||||
reader.ReadStartElement("RootPart");
|
// reader.ReadStartElement("RootPart");
|
||||||
m_rootPart = SceneObjectPart.FromXml(reader);
|
m_rootPart = SceneObjectPart.FromXml(reader);
|
||||||
reader.ReadEndElement();
|
//reader.ReadEndElement();
|
||||||
|
|
||||||
while (reader.Read())
|
while (reader.Read())
|
||||||
{
|
{
|
||||||
switch (reader.NodeType)
|
switch (reader.NodeType)
|
||||||
{
|
{
|
||||||
case XmlNodeType.Element:
|
case XmlNodeType.Element:
|
||||||
if (reader.Name == "Part")
|
if (reader.Name == "SceneObjectPart")
|
||||||
{
|
{
|
||||||
reader.Read();
|
// reader.Read();
|
||||||
SceneObjectPart Part = SceneObjectPart.FromXml(reader);
|
SceneObjectPart Part = SceneObjectPart.FromXml(reader);
|
||||||
AddPart(Part);
|
AddPart(Part);
|
||||||
}
|
}
|
||||||
|
|
|
@ -69,7 +69,9 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
|
|
||||||
protected byte[] m_particleSystem = new byte[0];
|
protected byte[] m_particleSystem = new byte[0];
|
||||||
|
|
||||||
|
[XmlIgnore]
|
||||||
public uint TimeStampFull = 0;
|
public uint TimeStampFull = 0;
|
||||||
|
[XmlIgnore]
|
||||||
public uint TimeStampTerse = 0;
|
public uint TimeStampTerse = 0;
|
||||||
|
|
||||||
protected SceneObjectGroup m_parentGroup;
|
protected SceneObjectGroup m_parentGroup;
|
||||||
|
|
Loading…
Reference in New Issue