From f8721c3c1cd5d4eb2827ea1cfd36e08f3a100345 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 18 Jul 2008 14:42:06 +0000
Subject: * refactor: break out sog loading code into two parts so that
 post-deserialization changes can be carried out before adding it to a scene

---
 .../Environment/Modules/World/Serialiser/SceneXmlLoader.cs     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs')

diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
index 6327d65..cd1fecb 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Region.Environment.Scenes
             return grp.ToXmlString2();
         }
 
-        public static SceneObjectGroup LoadGroupFromXml2(Scene scene, string xmlString)
+        public static SceneObjectGroup DeserializeGroupFromXml2(string xmlString)
         {
             XmlDocument doc = new XmlDocument();
             XmlNode rootNode;
@@ -124,15 +124,15 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 foreach (XmlNode aPrimNode in rootNode.ChildNodes)
                 {
-                    CreatePrimFromXml2(scene, aPrimNode.OuterXml);
+                    // There is only ever one prim.  This oddity should be removeable post 0.5.9
+                    return new SceneObjectGroup(aPrimNode.OuterXml);
                 }
-                
-                // There is only ever one prim, but it's easiest to return null here since this part should disappear post 0.5.9 anyway
+                               
                 return null;
             }
             else
             {
-                return CreatePrimFromXml2(scene, rootNode.OuterXml);
+                return new SceneObjectGroup(rootNode.OuterXml);
             }            
         }
 
-- 
cgit v1.1