aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs15
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs1
2 files changed, 13 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index acb6888..0af2ad2 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -473,6 +473,11 @@ namespace OpenSim.Region.Environment.Scenes
473 /// </summary> 473 /// </summary>
474 public SceneObjectGroup(string xmlData) 474 public SceneObjectGroup(string xmlData)
475 { 475 {
476 SetFromXml(xmlData);
477 }
478
479 protected void SetFromXml(string xmlData)
480 {
476 // libomv.types changes UUID to Guid 481 // libomv.types changes UUID to Guid
477 xmlData = xmlData.Replace("<UUID>", "<Guid>"); 482 xmlData = xmlData.Replace("<UUID>", "<Guid>");
478 xmlData = xmlData.Replace("</UUID>", "</Guid>"); 483 xmlData = xmlData.Replace("</UUID>", "</Guid>");
@@ -486,7 +491,7 @@ namespace OpenSim.Region.Environment.Scenes
486 reader.Read(); 491 reader.Read();
487 492
488 reader.ReadStartElement("SceneObjectGroup"); 493 reader.ReadStartElement("SceneObjectGroup");
489 SetRootPart(SceneObjectPart.FromXml(reader)); 494 SetRootPart(CreatePartFromXml(reader));
490 495
491 reader.Read(); 496 reader.Read();
492 bool more = true; 497 bool more = true;
@@ -498,7 +503,7 @@ namespace OpenSim.Region.Environment.Scenes
498 case XmlNodeType.Element: 503 case XmlNodeType.Element:
499 if (reader.Name == "SceneObjectPart") 504 if (reader.Name == "SceneObjectPart")
500 { 505 {
501 SceneObjectPart part = SceneObjectPart.FromXml(reader); 506 SceneObjectPart part = CreatePartFromXml(reader);
502 AddPart(part); 507 AddPart(part);
503 part.StoreUndoState(); 508 part.StoreUndoState();
504 } 509 }
@@ -519,6 +524,12 @@ namespace OpenSim.Region.Environment.Scenes
519 sr.Close(); 524 sr.Close();
520 } 525 }
521 526
527 protected virtual SceneObjectPart CreatePartFromXml(XmlTextReader reader)
528 {
529 SceneObjectPart part = SceneObjectPart.FromXml(reader);
530 return part;
531 }
532
522 /// <summary> 533 /// <summary>
523 /// Constructor. This object is added to the scene later via AttachToScene() 534 /// Constructor. This object is added to the scene later via AttachToScene()
524 /// </summary> 535 /// </summary>
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 5dbf3b7..acec921 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -1306,7 +1306,6 @@ if (m_shape != null) {
1306 /// <summary> 1306 /// <summary>
1307 /// Restore this part from the serialized xml representation. 1307 /// Restore this part from the serialized xml representation.
1308 /// </summary> 1308 /// </summary>
1309 /// <param name="xmlreader"></param>
1310 /// <returns></returns> 1309 /// <returns></returns>
1311 public static SceneObjectPart FromXml(XmlReader xmlReader) 1310 public static SceneObjectPart FromXml(XmlReader xmlReader)
1312 { 1311 {