From 583fa73126e425d98f12a6e5cef5487a3eb48e52 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 19 Dec 2008 18:33:03 +0000 Subject: * refactor: Remove archiver module scene wrappers --- .../RemoteController/RemoteAdminPlugin.cs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'OpenSim/ApplicationPlugins') diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 2c5adfe..4645ee6 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs @@ -37,9 +37,9 @@ using Nini.Config; using Nwc.XmlRpc; using OpenSim.Framework; using OpenSim.Framework.Servers; +using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Modules.World.Terrain; using OpenSim.Region.Environment.Scenes; -using OpenSim.Region.Environment.Modules.World.Archiver; namespace OpenSim.ApplicationPlugins.RemoteController { @@ -1082,9 +1082,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController } else throw new Exception("neither region_name nor region_uuid given"); - new ArchiveReadRequest(scene, filename); + IRegionArchiverModule archiver = scene.RequestModuleInterface(); + if (archiver != null) + archiver.DearchiveRegion(filename); + else + throw new Exception("Archiver module not present for scene"); + responseData["loaded"] = "true"; - + response.Value = responseData; } catch (Exception e) @@ -1173,7 +1178,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController } else throw new Exception("neither region_name nor region_uuid given"); - scene.SavePrimsToArchive(filename); + IRegionArchiverModule archiver = scene.RequestModuleInterface(); + if (archiver != null) + archiver.ArchiveRegion(filename); + else + throw new Exception("Archiver module not present for scene"); responseData["saved"] = "true"; -- cgit v1.1