From 0c94da830557fe17f2ff40b04031255375397717 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Thu, 22 May 2008 22:21:58 +0000
Subject: * Plug in stubbed out archiver module

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

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

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 8c95a0d..3ede889 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -40,6 +40,7 @@ using OpenSim.Framework.Communications;
 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.Terrain;
 using OpenSim.Region.Environment.Scenes.Scripting;
 using OpenSim.Region.Physics.Manager;
@@ -58,7 +59,6 @@ namespace OpenSim.Region.Environment.Scenes
         public SynchronizeSceneHandler SynchronizeScene = null;
         public int splitID = 0;
 
-
         #region Fields
 
         protected Timer m_heartbeatTimer = new Timer();
@@ -138,7 +138,6 @@ namespace OpenSim.Region.Environment.Scenes
         private int m_update_terrain = 50;
         private int m_update_land = 1;
 
-
         private int frameMS = 0;
         private int physicsMS2 = 0;
         private int physicsMS = 0;
@@ -631,7 +630,7 @@ namespace OpenSim.Region.Environment.Scenes
         }
 
         /// <summary>
-        /// Sets up references to loaded modules required by thie scene
+        /// Sets up references to modules required by the scene
         /// </summary>
         public void SetModuleInterfaces()
         {
@@ -1043,7 +1042,7 @@ namespace OpenSim.Region.Environment.Scenes
                         //}
                         //else
                         //{
-                        float tmpval = (float)hm[x, y];
+                        //float tmpval = (float)hm[x, y];
                         float heightvalue = (float)hm[x, y];
 
                         if ((float)heightvalue > m_regInfo.EstateSettings.waterHeight)
@@ -1380,6 +1379,26 @@ namespace OpenSim.Region.Environment.Scenes
         {
             m_sceneXmlLoader.SavePrimsToXml2(fileName);
         }
+        
+        /// <summary>
+        /// Load a prim archive into the scene.  This loads both prims and their assets.
+        /// </summary>
+        /// <param name="filePath"></param>
+        public void LoadPrimsFromArchive(string filePath)
+        {
+            IRegionArchiver archiver = RequestModuleInterface<IRegionArchiver>();
+            archiver.DearchiveRegion(this, filePath);
+        }
+        
+        /// <summary>
+        /// Save the prims in the scene to an archive.  This saves both prims and their assets.
+        /// </summary>
+        /// <param name="filePath"></param>
+        public void SavePrimsToArchive(string filePath)
+        {
+            IRegionArchiver archiver = RequestModuleInterface<IRegionArchiver>();
+            archiver.ArchiveRegion(this, filePath);
+        }
 
         /// <summary>
         /// Locate New region Handle and offset the prim position for the new region
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index 68dfa2f..2baef9d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -199,9 +199,9 @@ namespace OpenSim.Region.Environment.Scenes
         /// as well as the details of the prims themselves.
         /// </summary>
         /// <param name="filename"></param>
-        public void SaveCurrentSceneToOar(string filename)
+        public void SaveCurrentSceneToArchive(string filename)
         {
-            // TODO Nothing yet
+            CurrentOrFirstScene.LoadPrimsFromArchive(filename);
         }
         
         /// <summary>
@@ -209,9 +209,9 @@ namespace OpenSim.Region.Environment.Scenes
         /// their assets to the asset service.
         /// </summary>
         /// <param name="filename"></param>
-        public void LoadCurrentSceneFromOar(string filename)
+        public void LoadCurrentSceneFromArchive(string filename)
         {
-            // TODO Nothing yet
+            CurrentOrFirstScene.SavePrimsToArchive(filename);
         }
 
         [Obsolete("TODO: Remove this warning by 0.7")]
-- 
cgit v1.1