aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordr scofield (aka dirk husemann)2009-08-31 17:25:16 +0200
committerdr scofield (aka dirk husemann)2009-08-31 17:25:16 +0200
commit27b378ca8b6d035174b353734326dc8f4e6c70f7 (patch)
tree356aa46bcdedf4f50c6c105e1c1fd0ef5d9c3a6c
parentMerge branch 'regionready' into opensim (diff)
downloadopensim-SC_OLD-27b378ca8b6d035174b353734326dc8f4e6c70f7.zip
opensim-SC_OLD-27b378ca8b6d035174b353734326dc8f4e6c70f7.tar.gz
opensim-SC_OLD-27b378ca8b6d035174b353734326dc8f4e6c70f7.tar.bz2
opensim-SC_OLD-27b378ca8b6d035174b353734326dc8f4e6c70f7.tar.xz
switching Archiver to "new" region module scheme
-rw-r--r--OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml1
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs30
2 files changed, 25 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index 8831791..383063d 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -8,6 +8,7 @@
8 </Dependencies> 8 </Dependencies>
9 9
10 <Extension path = "/OpenSim/RegionModules"> 10 <Extension path = "/OpenSim/RegionModules">
11 <RegionModule id="ArchiverModule" type="OpenSim.Region.CoreModules.World.Archiver.ArchiverModule" />
11 <RegionModule id="CapabilitiesModule" type="OpenSim.Region.CoreModules.Agent.Capabilities.CapabilitiesModule" /> 12 <RegionModule id="CapabilitiesModule" type="OpenSim.Region.CoreModules.Agent.Capabilities.CapabilitiesModule" />
12 <RegionModule id="TerrainModule" type="OpenSim.Region.CoreModules.World.Terrain.TerrainModule" /> 13 <RegionModule id="TerrainModule" type="OpenSim.Region.CoreModules.World.Terrain.TerrainModule" />
13 <RegionModule id="RegionCombinerModule" type="OpenSim.Region.CoreModules.World.Land.RegionCombinerModule" /> 14 <RegionModule id="RegionCombinerModule" type="OpenSim.Region.CoreModules.World.Land.RegionCombinerModule" />
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
index f7d170b..f9b0225 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
@@ -38,23 +38,41 @@ namespace OpenSim.Region.CoreModules.World.Archiver
38 /// <summary> 38 /// <summary>
39 /// This module loads and saves OpenSimulator region archives 39 /// This module loads and saves OpenSimulator region archives
40 /// </summary> 40 /// </summary>
41 public class ArchiverModule : IRegionModule, IRegionArchiverModule 41 public class ArchiverModule : INonSharedRegionModule, IRegionArchiverModule
42 { 42 {
43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 43 private static readonly ILog m_log =
44 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 45
45 private Scene m_scene; 46 private Scene m_scene;
46 47
47 public string Name { get { return "Region Archiver Module"; } } 48 public string Name
49 {
50 get { return "RegionArchiverModule"; }
51 }
52
53 public Type ReplaceableInterface
54 {
55 get { return null; }
56 }
48 57
49 public bool IsSharedModule { get { return false; } }
50 58
51 public void Initialise(Scene scene, IConfigSource source) 59 public void Initialise(IConfigSource source)
60 {
61 m_log.Info("[ARCHIVER] Initialising");
62 }
63
64 public void AddRegion(Scene scene)
52 { 65 {
53 m_scene = scene; 66 m_scene = scene;
54 m_scene.RegisterModuleInterface<IRegionArchiverModule>(this); 67 m_scene.RegisterModuleInterface<IRegionArchiverModule>(this);
68 m_log.InfoFormat("[ARCHIVER]: Enabled for region {0}", scene.RegionInfo.RegionName);
69 }
70
71 public void RegionLoaded(Scene scene)
72 {
55 } 73 }
56 74
57 public void PostInitialise() 75 public void RemoveRegion(Scene scene)
58 { 76 {
59 } 77 }
60 78