* Start scripts loaded from an archive

3 files changed, 14 insertions, 7 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs
index 3ae7a54..0fc8ac3 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs
@@ -85,7 +85,8 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser
         /// </summary>
         /// <param name="scene"></param>
         /// <param name="xmlString"></param>
-        void LoadGroupFromXml2(Scene scene, string xmlString);
+        /// <returns>The scene object created</returns>
+        SceneObjectGroup LoadGroupFromXml2(Scene scene, string xmlString);
 
         /// <summary>
         /// Serialize an individual scene object into the xml2 format
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
index 9bab2b6..f283ecb 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 void LoadGroupFromXml2(Scene scene, string xmlString)
+        public static SceneObjectGroup LoadGroupFromXml2(Scene scene, string xmlString)
         {
             XmlDocument doc = new XmlDocument();
             XmlNode rootNode;
@@ -126,11 +126,14 @@ namespace OpenSim.Region.Environment.Scenes
                 {
                     CreatePrimFromXml2(scene, 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
             {
-                CreatePrimFromXml2(scene, rootNode.OuterXml);
-            }
+                return CreatePrimFromXml2(scene, rootNode.OuterXml);
+            }            
         }
 
         /// <summary>
@@ -177,11 +180,14 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         /// <param name="scene"></param>
         /// <param name="xmlData"></param>
-        protected static void CreatePrimFromXml2(Scene scene, string xmlData)
+        /// <returns>The scene object created</returns>
+        protected static SceneObjectGroup CreatePrimFromXml2(Scene scene, string xmlData)
         {
             SceneObjectGroup obj = new SceneObjectGroup(xmlData);
 
             scene.AddRestoredSceneObject(obj, true);
+            
+            return obj;
         }
 
         public static void SavePrimsToXml2(Scene scene, string fileName)
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
index c7b5fa5..eb3ab2e 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
@@ -112,9 +112,9 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser
             SceneXmlLoader.SavePrimsToXml2(scene, fileName);
         }
 
-        public void LoadGroupFromXml2(Scene scene, string xmlString)
+        public SceneObjectGroup LoadGroupFromXml2(Scene scene, string xmlString)
         {
-            SceneXmlLoader.LoadGroupFromXml2(scene, xmlString);
+            return SceneXmlLoader.LoadGroupFromXml2(scene, xmlString);
         }
 
         public string SaveGroupToXml2(SceneObjectGroup grp)