From aa497a18678c6cc9a7425986c5bf5ca91415bd1d Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 19 Dec 2008 19:47:11 +0000
Subject: * refactor: move saved named prims to xml2 method out into the
 serialization module

---
 OpenSim/Region/Environment/Scenes/Scene.cs        | 22 ----------------------
 OpenSim/Region/Environment/Scenes/SceneManager.cs |  4 +++-
 2 files changed, 3 insertions(+), 23 deletions(-)

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

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index eaf04ea..70cd45e 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1880,28 +1880,6 @@ namespace OpenSim.Region.Environment.Scenes
             return false;
         }
 
-        public void SaveNamedPrimsToXml2(string primName, string fileName)
-        {
-            m_log.InfoFormat(
-                "[SCENE]: Saving prims with name {0} in xml2 format for region {1} to {2}", primName, RegionInfo.RegionName, fileName);
-
-            List<EntityBase> entityList = GetEntities();
-            List<EntityBase> primList = new List<EntityBase>();
-
-            foreach (EntityBase ent in entityList)
-            {
-                if (ent is SceneObjectGroup)
-                {
-                    if (ent.Name == primName)
-                    {
-                        primList.Add(ent);
-                    }
-                }
-            }
-
-            m_serialiser.SavePrimListToXml2(primList, fileName);
-        }
-
         /// <summary>
         /// Move the given scene object into a new region depending on which region its absolute position has moved
         /// into.
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index 9e83f25..d585b48 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -215,7 +215,9 @@ namespace OpenSim.Region.Environment.Scenes
 
         public void SaveNamedPrimsToXml2(string primName, string filename)
         {
-            CurrentOrFirstScene.SaveNamedPrimsToXml2( primName, filename);
+            IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>();
+            if (serialiser != null)               
+                serialiser.SaveNamedPrimsToXml2(CurrentOrFirstScene, primName, filename);
         }
 
         /// <summary>
-- 
cgit v1.1