From e62016d2c77270a0dc23e31c5d1ccc2d412fcec3 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 19 Dec 2008 19:35:14 +0000
Subject: minor: Remove some serialization module scene wrappers

---
 OpenSim/Region/Environment/Scenes/Scene.cs        | 28 -----------------------
 OpenSim/Region/Environment/Scenes/SceneManager.cs |  8 +++++--
 2 files changed, 6 insertions(+), 30 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 7d83ee2..eaf04ea 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1880,34 +1880,6 @@ namespace OpenSim.Region.Environment.Scenes
             return false;
         }
 
-        public void LoadPrimsFromXml2(string fileName)
-        {
-            m_log.InfoFormat("[SCENE]: Loading prims in xml2 format to region {0} from {1}", RegionInfo.RegionName, fileName);
-
-            m_serialiser.LoadPrimsFromXml2(this, fileName);
-        }
-
-        public void LoadPrimsFromXml2(TextReader reader, bool startScripts)
-        {
-            m_log.InfoFormat("[SCENE]: Loading prims in xml2 format to region {0} from stream", RegionInfo.RegionName);
-
-            m_serialiser.LoadPrimsFromXml2(this, reader, startScripts);
-        }
-
-        public void SavePrimsToXml2(string fileName)
-        {
-            m_log.InfoFormat("[SCENE]: Saving prims in xml2 format for region {0} to {1}", RegionInfo.RegionName, fileName);
-
-            m_serialiser.SavePrimsToXml2(this, fileName);
-        }
-
-        public void SavePrimsToXml2(TextWriter stream, Vector3 min, Vector3 max)
-        {
-            m_log.InfoFormat("[SCENE]: Saving prims in xml2 format for region {0} to stream", RegionInfo.RegionName);
-
-            m_serialiser.SavePrimsToXml2(this, stream, min, max);
-        }
-
         public void SaveNamedPrimsToXml2(string primName, string fileName)
         {
             m_log.InfoFormat(
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index b973ced..9e83f25 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -208,7 +208,9 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="filename"></param>
         public void SaveCurrentSceneToXml2(string filename)
         {
-            CurrentOrFirstScene.SavePrimsToXml2(filename);
+            IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>();
+            if (serialiser != null)            
+                serialiser.SavePrimsToXml2(CurrentOrFirstScene, filename);
         }
 
         public void SaveNamedPrimsToXml2(string primName, string filename)
@@ -221,7 +223,9 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         public void LoadCurrentSceneFromXml2(string filename)
         {
-            CurrentOrFirstScene.LoadPrimsFromXml2(filename);
+            IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>();
+            if (serialiser != null)              
+                serialiser.LoadPrimsFromXml2(CurrentOrFirstScene, filename);
         }
 
         /// <summary>
-- 
cgit v1.1