diff options
author | Justin Clarke Casey | 2008-12-19 18:33:03 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-12-19 18:33:03 +0000 |
commit | 583fa73126e425d98f12a6e5cef5487a3eb48e52 (patch) | |
tree | e8383ce36027550c664c5449b232e25f3e121a73 /OpenSim/Region/Environment/Modules | |
parent | * Add missing file from last commit (diff) | |
download | opensim-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/Region/Environment/Interfaces/IRegionArchiverModule.cs (renamed from OpenSim/Region/Environment/Modules/World/Archiver/IRegionArchiver.cs) | 6 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/IRegionArchiver.cs b/OpenSim/Region/Environment/Interfaces/IRegionArchiverModule.cs index b949666..11eea20 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/IRegionArchiver.cs +++ b/OpenSim/Region/Environment/Interfaces/IRegionArchiverModule.cs | |||
@@ -25,14 +25,12 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using OpenSim.Region.Environment.Scenes; | 28 | namespace OpenSim.Region.Environment.Interfaces |
29 | |||
30 | namespace OpenSim.Region.Environment.Modules.World.Archiver | ||
31 | { | 29 | { |
32 | /// <summary> | 30 | /// <summary> |
33 | /// Interface to region archive functionality | 31 | /// Interface to region archive functionality |
34 | /// </summary> | 32 | /// </summary> |
35 | public interface IRegionArchiver | 33 | public interface IRegionArchiverModule |
36 | { | 34 | { |
37 | /// <summary> | 35 | /// <summary> |
38 | /// Archive the region to the given path | 36 | /// Archive the region to the given path |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs index df17ad2..de60472 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs | |||
@@ -40,9 +40,9 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
40 | /// <summary> | 40 | /// <summary> |
41 | /// This module loads and saves OpenSimulator archives | 41 | /// This module loads and saves OpenSimulator archives |
42 | /// </summary> | 42 | /// </summary> |
43 | public class ArchiverModule : IRegionModule, IRegionArchiver | 43 | public class ArchiverModule : IRegionModule, IRegionArchiverModule |
44 | { | 44 | { |
45 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | 46 | ||
47 | /// <summary> | 47 | /// <summary> |
48 | /// Scene to which this module belongs | 48 | /// Scene to which this module belongs |
@@ -58,8 +58,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
58 | public void Initialise(Scene scene, IConfigSource source) | 58 | public void Initialise(Scene scene, IConfigSource source) |
59 | { | 59 | { |
60 | m_scene = scene; | 60 | m_scene = scene; |
61 | 61 | m_scene.RegisterModuleInterface<IRegionArchiverModule>(this); | |
62 | m_scene.RegisterModuleInterface<IRegionArchiver>(this); | ||
63 | } | 62 | } |
64 | 63 | ||
65 | public void PostInitialise() | 64 | public void PostInitialise() |
@@ -72,11 +71,15 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
72 | 71 | ||
73 | public void ArchiveRegion(string savePath) | 72 | public void ArchiveRegion(string savePath) |
74 | { | 73 | { |
74 | m_log.InfoFormat("[SCENE]: Writing archive for region {0} to {1}", m_scene.RegionInfo.RegionName, savePath); | ||
75 | |||
75 | new ArchiveWriteRequestPreparation(m_scene, savePath).ArchiveRegion(); | 76 | new ArchiveWriteRequestPreparation(m_scene, savePath).ArchiveRegion(); |
76 | } | 77 | } |
77 | 78 | ||
78 | public void DearchiveRegion(string loadPath) | 79 | public void DearchiveRegion(string loadPath) |
79 | { | 80 | { |
81 | m_log.InfoFormat("[SCENE]: Loading archive to region {0} from {1}", m_scene.RegionInfo.RegionName, loadPath); | ||
82 | |||
80 | new ArchiveReadRequest(m_scene, loadPath); | 83 | new ArchiveReadRequest(m_scene, loadPath); |
81 | } | 84 | } |
82 | } | 85 | } |