diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneManager.cs | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs index 9ad2036..1a8babc 100644 --- a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs | |||
@@ -34,7 +34,10 @@ namespace OpenSim.Region.Framework.Interfaces | |||
34 | /// Interface to region archive functionality | 34 | /// Interface to region archive functionality |
35 | /// </summary> | 35 | /// </summary> |
36 | public interface IRegionArchiverModule | 36 | public interface IRegionArchiverModule |
37 | { | 37 | { |
38 | void HandleLoadOarConsoleCommand(string module, string[] cmdparams); | ||
39 | void HandleSaveOarConsoleCommand(string module, string[] cmdparams); | ||
40 | |||
38 | /// <summary> | 41 | /// <summary> |
39 | /// Archive the region to the given path | 42 | /// Archive the region to the given path |
40 | /// </summary> | 43 | /// </summary> |
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs index dfaa7ea..c2e3370 100644 --- a/OpenSim/Region/Framework/Scenes/SceneManager.cs +++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs | |||
@@ -241,24 +241,24 @@ namespace OpenSim.Region.Framework.Scenes | |||
241 | /// Save the current scene to an OpenSimulator archive. This archive will eventually include the prim's assets | 241 | /// Save the current scene to an OpenSimulator archive. This archive will eventually include the prim's assets |
242 | /// as well as the details of the prims themselves. | 242 | /// as well as the details of the prims themselves. |
243 | /// </summary> | 243 | /// </summary> |
244 | /// <param name="filename"></param> | 244 | /// <param name="cmdparams"></param> |
245 | public void SaveCurrentSceneToArchive(string filename) | 245 | public void SaveCurrentSceneToArchive(string[] cmdparams) |
246 | { | 246 | { |
247 | IRegionArchiverModule archiver = CurrentOrFirstScene.RequestModuleInterface<IRegionArchiverModule>(); | 247 | IRegionArchiverModule archiver = CurrentOrFirstScene.RequestModuleInterface<IRegionArchiverModule>(); |
248 | if (archiver != null) | 248 | if (archiver != null) |
249 | archiver.ArchiveRegion(filename); | 249 | archiver.HandleSaveOarConsoleCommand(string.Empty, cmdparams); |
250 | } | 250 | } |
251 | 251 | ||
252 | /// <summary> | 252 | /// <summary> |
253 | /// Load an OpenSim archive into the current scene. This will load both the shapes of the prims and upload | 253 | /// Load an OpenSim archive into the current scene. This will load both the shapes of the prims and upload |
254 | /// their assets to the asset service. | 254 | /// their assets to the asset service. |
255 | /// </summary> | 255 | /// </summary> |
256 | /// <param name="filename"></param> | 256 | /// <param name="cmdparams"></param> |
257 | public void LoadArchiveToCurrentScene(string filename) | 257 | public void LoadArchiveToCurrentScene(string[] cmdparams) |
258 | { | 258 | { |
259 | IRegionArchiverModule archiver = CurrentOrFirstScene.RequestModuleInterface<IRegionArchiverModule>(); | 259 | IRegionArchiverModule archiver = CurrentOrFirstScene.RequestModuleInterface<IRegionArchiverModule>(); |
260 | if (archiver != null) | 260 | if (archiver != null) |
261 | archiver.DearchiveRegion(filename); | 261 | archiver.HandleLoadOarConsoleCommand(string.Empty, cmdparams); |
262 | } | 262 | } |
263 | 263 | ||
264 | public string SaveCurrentSceneMapToXmlString() | 264 | public string SaveCurrentSceneMapToXmlString() |