aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-12-19 18:33:03 +0000
committerJustin Clarke Casey2008-12-19 18:33:03 +0000
commit583fa73126e425d98f12a6e5cef5487a3eb48e52 (patch)
treee8383ce36027550c664c5449b232e25f3e121a73 /OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
parent* Add missing file from last commit (diff)
downloadopensim-SC_OLD-583fa73126e425d98f12a6e5cef5487a3eb48e52.zip
opensim-SC_OLD-583fa73126e425d98f12a6e5cef5487a3eb48e52.tar.gz
opensim-SC_OLD-583fa73126e425d98f12a6e5cef5487a3eb48e52.tar.bz2
opensim-SC_OLD-583fa73126e425d98f12a6e5cef5487a3eb48e52.tar.xz
* refactor: Remove archiver module scene wrappers
Diffstat (limited to '')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs17
1 files changed, 13 insertions, 4 deletions
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;
37using Nwc.XmlRpc; 37using Nwc.XmlRpc;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Framework.Servers; 39using OpenSim.Framework.Servers;
40using OpenSim.Region.Environment.Interfaces;
40using OpenSim.Region.Environment.Modules.World.Terrain; 41using OpenSim.Region.Environment.Modules.World.Terrain;
41using OpenSim.Region.Environment.Scenes; 42using OpenSim.Region.Environment.Scenes;
42using OpenSim.Region.Environment.Modules.World.Archiver;
43 43
44namespace OpenSim.ApplicationPlugins.RemoteController 44namespace OpenSim.ApplicationPlugins.RemoteController
45{ 45{
@@ -1082,9 +1082,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1082 } 1082 }
1083 else throw new Exception("neither region_name nor region_uuid given"); 1083 else throw new Exception("neither region_name nor region_uuid given");
1084 1084
1085 new ArchiveReadRequest(scene, filename); 1085 IRegionArchiverModule archiver = scene.RequestModuleInterface<IRegionArchiverModule>();
1086 if (archiver != null)
1087 archiver.DearchiveRegion(filename);
1088 else
1089 throw new Exception("Archiver module not present for scene");
1090
1086 responseData["loaded"] = "true"; 1091 responseData["loaded"] = "true";
1087 1092
1088 response.Value = responseData; 1093 response.Value = responseData;
1089 } 1094 }
1090 catch (Exception e) 1095 catch (Exception e)
@@ -1173,7 +1178,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1173 } 1178 }
1174 else throw new Exception("neither region_name nor region_uuid given"); 1179 else throw new Exception("neither region_name nor region_uuid given");
1175 1180
1176 scene.SavePrimsToArchive(filename); 1181 IRegionArchiverModule archiver = scene.RequestModuleInterface<IRegionArchiverModule>();
1182 if (archiver != null)
1183 archiver.ArchiveRegion(filename);
1184 else
1185 throw new Exception("Archiver module not present for scene");
1177 1186
1178 responseData["saved"] = "true"; 1187 responseData["saved"] = "true";
1179 1188