2 files changed, 19 insertions, 249 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index c1e8602..26f3499 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -41,6 +41,7 @@ using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Modules.World.Archiver;
+using OpenSim.Region.Environment.Modules.World.Serialiser;
 using OpenSim.Region.Environment.Modules.World.Terrain;
 using OpenSim.Region.Environment.Scenes.Scripting;
 using OpenSim.Region.Physics.Manager;
@@ -94,7 +95,6 @@ namespace OpenSim.Region.Environment.Scenes
         public CommunicationsManager CommsManager;
 
         protected SceneCommunicationService m_sceneGridService;
-        protected SceneXmlLoader m_sceneXmlLoader;
 
         /// <summary>
         /// Each agent has its own capabilities handler.
@@ -268,8 +268,6 @@ namespace OpenSim.Region.Environment.Scenes
             // Operating system has killed the plugin
             m_innerScene.UnRecoverableError += RestartNow;
 
-            m_sceneXmlLoader = new SceneXmlLoader(this, m_innerScene, m_regInfo);
-
             RegisterDefaultSceneEvents();
 
             m_httpListener = httpServer;
@@ -1400,22 +1398,26 @@ namespace OpenSim.Region.Environment.Scenes
 
         public void LoadPrimsFromXml(string fileName, bool newIdsFlag, LLVector3 loadOffset)
         {
-            m_sceneXmlLoader.LoadPrimsFromXml(fileName, newIdsFlag, loadOffset);
+            IRegionSerialiser loader = RequestModuleInterface<IRegionSerialiser>();
+            loader.LoadPrimsFromXml(this, fileName, newIdsFlag, loadOffset);
         }
 
         public void SavePrimsToXml(string fileName)
         {
-            m_sceneXmlLoader.SavePrimsToXml(fileName);
+            IRegionSerialiser loader = RequestModuleInterface<IRegionSerialiser>();
+            loader.SavePrimsToXml(this, fileName);
         }
 
         public void LoadPrimsFromXml2(string fileName)
         {
-            m_sceneXmlLoader.LoadPrimsFromXml2(fileName);
+            IRegionSerialiser loader = RequestModuleInterface<IRegionSerialiser>();
+            loader.LoadPrimsFromXml2(this, fileName);
         }
 
         public void SavePrimsToXml2(string fileName)
         {
-            m_sceneXmlLoader.SavePrimsToXml2(fileName);
+            IRegionSerialiser loader = RequestModuleInterface<IRegionSerialiser>();
+            loader.SavePrimsToXml2(this, fileName);
         }
 
         /// <summary>
@@ -1505,15 +1507,20 @@ namespace OpenSim.Region.Environment.Scenes
             grp.OffsetForNewRegion(pos);
 
             CrossPrimGroupIntoNewRegion(newRegionHandle, grp);
-
         }
+        
         public void CrossPrimGroupIntoNewRegion(ulong newRegionHandle, SceneObjectGroup grp)
         {
             int primcrossingXMLmethod = 0;
             if (newRegionHandle != 0)
             {
                 bool successYN = false;
-                successYN = m_sceneGridService.PrimCrossToNeighboringRegion(newRegionHandle, grp.UUID, m_sceneXmlLoader.SavePrimGroupToXML2String(grp), primcrossingXMLmethod);
+                
+                IRegionSerialiser loader = RequestModuleInterface<IRegionSerialiser>();
+                successYN 
+                    = m_sceneGridService.PrimCrossToNeighboringRegion(
+                        newRegionHandle, grp.UUID, loader.SavePrimGroupToXML2String(grp), primcrossingXMLmethod);
+                
                 if (successYN)
                 {
                     // We remove the object here
@@ -1545,7 +1552,9 @@ namespace OpenSim.Region.Environment.Scenes
             m_log.Warn("{[INTERREGION]: A new prim arrived from a neighbor");
             if (XMLMethod == 0)
             {
-                m_sceneXmlLoader.LoadGroupFromXml2String(objXMLData);
+                IRegionSerialiser loader = RequestModuleInterface<IRegionSerialiser>();
+                loader.LoadGroupFromXml2String(this, objXMLData);
+                
                 SceneObjectPart RootPrim = GetSceneObjectPart(primID);
                 if (RootPrim != null)
                 {
@@ -3025,7 +3034,6 @@ namespace OpenSim.Region.Environment.Scenes
 
         public bool pipeEventsForScript(uint localID)
         {
-
             SceneObjectPart part = GetSceneObjectPart(localID);
             if (part != null)
             {
diff --git a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs b/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs
deleted file mode 100644
index 742996e..0000000
--- a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Xml;
-using Axiom.Math;
-using libsecondlife;
-using OpenSim.Framework;
-using OpenSim.Region.Physics.Manager;
-
-namespace OpenSim.Region.Environment.Scenes
-{
-    public class SceneXmlLoader // can move to a module?
-    {
-        protected InnerScene m_innerScene;
-        protected RegionInfo m_regInfo;
-        protected Scene m_parentScene;
-
-        public SceneXmlLoader(Scene parentScene, InnerScene innerScene, RegionInfo regionInfo)
-        {
-            m_parentScene = parentScene;
-            m_innerScene = innerScene;
-            m_regInfo = regionInfo;
-        }
-
-        public void LoadPrimsFromXml(string fileName, bool newIDS, LLVector3 loadOffset)
-        {
-            XmlDocument doc = new XmlDocument();
-            XmlNode rootNode;
-            int primCount = 0;
-            if (fileName.StartsWith("http:") || File.Exists(fileName))
-            {
-                XmlTextReader reader = new XmlTextReader(fileName);
-                reader.WhitespaceHandling = WhitespaceHandling.None;
-                doc.Load(reader);
-                reader.Close();
-                rootNode = doc.FirstChild;
-                foreach (XmlNode aPrimNode in rootNode.ChildNodes)
-                {
-                    SceneObjectGroup obj = new SceneObjectGroup(m_parentScene,
-                                                                m_regInfo.RegionHandle, aPrimNode.OuterXml);
-                    if (newIDS)
-                    {
-                        obj.ResetIDs();
-                    }
-                    //if we want this to be a import method then we need new uuids for the object to avoid any clashes
-                    //obj.RegenerateFullIDs();
-                    
-                    m_innerScene.AddSceneObject(obj);
-
-                    SceneObjectPart rootPart = obj.GetChildPart(obj.UUID);
-                    // Apply loadOffsets for load/import and move combinations
-                    rootPart.GroupPosition = rootPart.AbsolutePosition + loadOffset;
-                    bool UsePhysics = (((rootPart.GetEffectiveObjectFlags() & (uint) LLObject.ObjectFlags.Physics) > 0) &&
-                                       m_parentScene.m_physicalPrim);
-                    if ((rootPart.GetEffectiveObjectFlags() & (uint) LLObject.ObjectFlags.Phantom) == 0)
-                    {
-                        rootPart.PhysActor = m_innerScene.PhysicsScene.AddPrimShape(
-                            rootPart.Name,
-                            rootPart.Shape,
-                            new PhysicsVector(rootPart.AbsolutePosition.X + loadOffset.X,
-                                              rootPart.AbsolutePosition.Y + loadOffset.Y,
-                                              rootPart.AbsolutePosition.Z + loadOffset.Z),
-                            new PhysicsVector(rootPart.Scale.X, rootPart.Scale.Y, rootPart.Scale.Z),
-                            new Quaternion(rootPart.RotationOffset.W, rootPart.RotationOffset.X,
-                                           rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics);
-
-                        // to quote from SceneObjectPart: Basic
-                        // Physics returns null..  joy joy joy.
-                        if (rootPart.PhysActor != null)
-                        {
-                            rootPart.PhysActor.LocalID = rootPart.LocalId;
-                            rootPart.DoPhysicsPropertyUpdate(UsePhysics, true);
-                        }
-                    }
-                    primCount++;
-                }
-            }
-            else
-            {
-                throw new Exception("Could not open file " + fileName + " for reading");
-            }
-        }
-
-        public void SavePrimsToXml(string fileName)
-        {
-            FileStream file = new FileStream(fileName, FileMode.Create);
-            StreamWriter stream = new StreamWriter(file);
-            int primCount = 0;
-            stream.WriteLine("<scene>\n");
-
-            List<EntityBase> EntityList = m_innerScene.GetEntities();
-
-            foreach (EntityBase ent in EntityList)
-            {
-                if (ent is SceneObjectGroup)
-                {
-                    stream.WriteLine(((SceneObjectGroup) ent).ToXmlString());
-                    primCount++;
-                }
-            }
-            stream.WriteLine("</scene>\n");
-            stream.Close();
-            file.Close();
-        }
-
-        public string SavePrimGroupToXML2String(SceneObjectGroup grp)
-        {
-            string returnstring = "";
-            returnstring += "<scene>\n";
-            returnstring += grp.ToXmlString2();
-            returnstring += "</scene>\n";
-            return returnstring;
-
-        }
-
-        public void LoadGroupFromXml2String(string xmlString)
-        {
-            XmlDocument doc = new XmlDocument();
-            XmlNode rootNode;
-
-            XmlTextReader reader = new XmlTextReader(new StringReader(xmlString));
-            reader.WhitespaceHandling = WhitespaceHandling.None;
-            doc.Load(reader);
-            reader.Close();
-            rootNode = doc.FirstChild;
-            foreach (XmlNode aPrimNode in rootNode.ChildNodes)
-            {
-                CreatePrimFromXml(aPrimNode.OuterXml);
-            }
-
-        }
-
-        public void LoadPrimsFromXml2(string fileName)
-        {
-            XmlDocument doc = new XmlDocument();
-            XmlNode rootNode;
-            if (fileName.StartsWith("http:") || File.Exists(fileName))
-            {
-                XmlTextReader reader = new XmlTextReader(fileName);
-                reader.WhitespaceHandling = WhitespaceHandling.None;
-                doc.Load(reader);
-                reader.Close();
-                rootNode = doc.FirstChild;
-                foreach (XmlNode aPrimNode in rootNode.ChildNodes)
-                {
-                    CreatePrimFromXml(aPrimNode.OuterXml);
-                }
-            }
-            else
-            {
-                throw new Exception("Could not open file " + fileName + " for reading");
-            }
-        }
-
-        public void CreatePrimFromXml(string xmlData)
-        {
-            SceneObjectGroup obj = new SceneObjectGroup(xmlData);
-            LLVector3 receivedVelocity = obj.RootPart.Velocity;
-            //System.Console.WriteLine(obj.RootPart.Velocity.ToString());
-            m_innerScene.AddSceneObjectFromStorage(obj);
-
-            SceneObjectPart rootPart = obj.GetChildPart(obj.UUID);
-            bool UsePhysics = (((rootPart.GetEffectiveObjectFlags() & (uint) LLObject.ObjectFlags.Physics) > 0) &&
-                               m_parentScene.m_physicalPrim);
-            if ((rootPart.GetEffectiveObjectFlags() & (uint) LLObject.ObjectFlags.Phantom) == 0)
-            {
-                rootPart.PhysActor = m_innerScene.PhysicsScene.AddPrimShape(
-                    rootPart.Name,
-                    rootPart.Shape,
-                    new PhysicsVector(rootPart.AbsolutePosition.X, rootPart.AbsolutePosition.Y,
-                                      rootPart.AbsolutePosition.Z),
-                    new PhysicsVector(rootPart.Scale.X, rootPart.Scale.Y, rootPart.Scale.Z),
-                    new Quaternion(rootPart.RotationOffset.W, rootPart.RotationOffset.X,
-                                   rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics);
-
-                // to quote from SceneObjectPart: Basic
-                // Physics returns null..  joy joy joy.
-                if (rootPart.PhysActor != null)
-                {
-                    rootPart.PhysActor.LocalID = rootPart.LocalId;
-                    rootPart.DoPhysicsPropertyUpdate(UsePhysics, true);
-                }
-                rootPart.Velocity = receivedVelocity;
-            }
-
-            obj.ScheduleGroupForFullUpdate();
-        }
-
-        public void SavePrimsToXml2(string fileName)
-        {
-            FileStream file = new FileStream(fileName, FileMode.Create);
-            StreamWriter stream = new StreamWriter(file);
-            int primCount = 0;
-            stream.WriteLine("<scene>\n");
-
-            List<EntityBase> EntityList = m_innerScene.GetEntities();
-
-            foreach (EntityBase ent in EntityList)
-            {
-                if (ent is SceneObjectGroup)
-                {
-                    stream.WriteLine(((SceneObjectGroup) ent).ToXmlString2());
-                    primCount++;
-                }
-            }
-            stream.WriteLine("</scene>\n");
-            stream.Close();
-            file.Close();
-        }
-    }
-}