* Abstracted some methods from SceneObjectGroup to allow them to be overridden more easily. Specifically object creation from XML.

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
         /// </summary>
         public SceneObjectGroup(string xmlData)
         {
+            SetFromXml(xmlData);
+        }
+
+        protected void SetFromXml(string xmlData)
+        {
             // libomv.types changes UUID to Guid
             xmlData = xmlData.Replace("<UUID>", "<Guid>");
             xmlData = xmlData.Replace("</UUID>", "</Guid>");
@@ -486,7 +491,7 @@ namespace OpenSim.Region.Environment.Scenes
             reader.Read();
 
             reader.ReadStartElement("SceneObjectGroup");
-            SetRootPart(SceneObjectPart.FromXml(reader));
+            SetRootPart(CreatePartFromXml(reader));
 
             reader.Read();
             bool more = true;
@@ -498,7 +503,7 @@ namespace OpenSim.Region.Environment.Scenes
                     case XmlNodeType.Element:
                         if (reader.Name == "SceneObjectPart")
                         {
-                            SceneObjectPart part = SceneObjectPart.FromXml(reader);
+                            SceneObjectPart part = CreatePartFromXml(reader);
                             AddPart(part);
                             part.StoreUndoState();
                         }
@@ -519,6 +524,12 @@ namespace OpenSim.Region.Environment.Scenes
             sr.Close();
         }
 
+        protected virtual SceneObjectPart CreatePartFromXml(XmlTextReader reader)
+        {
+            SceneObjectPart part = SceneObjectPart.FromXml(reader);
+            return part;
+        }
+
         /// <summary>
         /// Constructor.  This object is added to the scene later via AttachToScene()
         /// </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) {
         /// <summary>
         /// Restore this part from the serialized xml representation.
         /// </summary>
-        /// <param name="xmlreader"></param>
         /// <returns></returns>
         public static SceneObjectPart FromXml(XmlReader xmlReader)
         {