aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMW2007-10-16 11:16:25 +0000
committerMW2007-10-16 11:16:25 +0000
commit0f1604a53f8ee74073effffae9f1220acc067f84 (patch)
treefbae9443789c6b17c8219d29feaab10b8b07f2da /OpenSim/Region
parentAdded support for 64 bit windows (diff)
downloadopensim-SC_OLD-0f1604a53f8ee74073effffae9f1220acc067f84.zip
opensim-SC_OLD-0f1604a53f8ee74073effffae9f1220acc067f84.tar.gz
opensim-SC_OLD-0f1604a53f8ee74073effffae9f1220acc067f84.tar.bz2
opensim-SC_OLD-0f1604a53f8ee74073effffae9f1220acc067f84.tar.xz
Couple of small changes to Xml serialising of SceneObjectGroups (shouldn't effect anything).
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs2
2 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 6a2f105..f1930ea 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -271,18 +271,18 @@ namespace OpenSim.Region.Environment.Scenes
271 XmlTextReader reader = new XmlTextReader(sr); 271 XmlTextReader reader = new XmlTextReader(sr);
272 reader.Read(); 272 reader.Read();
273 reader.ReadStartElement("SceneObjectGroup"); 273 reader.ReadStartElement("SceneObjectGroup");
274 reader.ReadStartElement("RootPart"); 274 // reader.ReadStartElement("RootPart");
275 m_rootPart = SceneObjectPart.FromXml(reader); 275 m_rootPart = SceneObjectPart.FromXml(reader);
276 reader.ReadEndElement(); 276 //reader.ReadEndElement();
277 277
278 while (reader.Read()) 278 while (reader.Read())
279 { 279 {
280 switch (reader.NodeType) 280 switch (reader.NodeType)
281 { 281 {
282 case XmlNodeType.Element: 282 case XmlNodeType.Element:
283 if (reader.Name == "Part") 283 if (reader.Name == "SceneObjectPart")
284 { 284 {
285 reader.Read(); 285 // reader.Read();
286 SceneObjectPart Part = SceneObjectPart.FromXml(reader); 286 SceneObjectPart Part = SceneObjectPart.FromXml(reader);
287 AddPart(Part); 287 AddPart(Part);
288 } 288 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 7161183..58d2157 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -69,7 +69,9 @@ namespace OpenSim.Region.Environment.Scenes
69 69
70 protected byte[] m_particleSystem = new byte[0]; 70 protected byte[] m_particleSystem = new byte[0];
71 71
72 [XmlIgnore]
72 public uint TimeStampFull = 0; 73 public uint TimeStampFull = 0;
74 [XmlIgnore]
73 public uint TimeStampTerse = 0; 75 public uint TimeStampTerse = 0;
74 76
75 protected SceneObjectGroup m_parentGroup; 77 protected SceneObjectGroup m_parentGroup;