aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Interfaces/IRegionSerialiserModule.cs (renamed from OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs)4
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs6
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs12
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs4
8 files changed, 19 insertions, 21 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs b/OpenSim/Region/Environment/Interfaces/IRegionSerialiserModule.cs
index bbc4acf..29d5d47 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs
+++ b/OpenSim/Region/Environment/Interfaces/IRegionSerialiserModule.cs
@@ -30,9 +30,9 @@ using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Environment.Scenes;
32 32
33namespace OpenSim.Region.Environment.Modules.World.Serialiser 33namespace OpenSim.Region.Environment.Interfaces
34{ 34{
35 public interface IRegionSerialiser 35 public interface IRegionSerialiserModule
36 { 36 {
37 List<string> SerialiseRegion(Scene scene, string saveDir); 37 List<string> SerialiseRegion(Scene scene, string saveDir);
38 38
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs
index 607f6a9..3a8e374 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
69 69
70 private string m_repodir = null; 70 private string m_repodir = null;
71 private Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>(); 71 private Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>();
72 private Dictionary<UUID, IRegionSerialiser> m_serialiser = new Dictionary<UUID, IRegionSerialiser>(); 72 private Dictionary<UUID, IRegionSerialiserModule> m_serialiser = new Dictionary<UUID, IRegionSerialiserModule>();
73 73
74 #endregion Fields 74 #endregion Fields
75 75
@@ -105,9 +105,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
105 { 105 {
106 foreach (UUID region in m_scenes.Keys) 106 foreach (UUID region in m_scenes.Keys)
107 { 107 {
108 m_serialiser.Add(region, 108 m_serialiser.Add(region, m_scenes[region].RequestModuleInterface<IRegionSerialiserModule>());
109 m_scenes[region].RequestModuleInterface<IRegionSerialiser>()
110 );
111 } 109 }
112 } 110 }
113 } 111 }
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
index 3cd0652..e04662f 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
@@ -25,11 +25,6 @@
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
28using OpenSim.Framework;
29using OpenSim.Region.Environment.Scenes;
30using OpenSim.Region.Environment.Modules.World.Serialiser;
31using OpenSim.Region.Environment.Modules.World.Terrain;
32using OpenSim.Framework.Communications.Cache;
33using System; 28using System;
34using System.Collections.Generic; 29using System.Collections.Generic;
35using System.IO; 30using System.IO;
@@ -39,6 +34,11 @@ using System.Xml;
39using System.Net; 34using System.Net;
40using OpenMetaverse; 35using OpenMetaverse;
41using log4net; 36using log4net;
37using OpenSim.Framework;
38using OpenSim.Framework.Communications.Cache;
39using OpenSim.Region.Environment.Interfaces;
40using OpenSim.Region.Environment.Scenes;
41using OpenSim.Region.Environment.Modules.World.Terrain;
42 42
43namespace OpenSim.Region.Environment.Modules.World.Archiver 43namespace OpenSim.Region.Environment.Modules.World.Archiver
44{ 44{
@@ -124,7 +124,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
124 // Reload serialized prims 124 // Reload serialized prims
125 m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects. Please wait.", serialisedSceneObjects.Count); 125 m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects. Please wait.", serialisedSceneObjects.Count);
126 126
127 IRegionSerialiser serialiser = m_scene.RequestModuleInterface<IRegionSerialiser>(); 127 IRegionSerialiserModule serialiser = m_scene.RequestModuleInterface<IRegionSerialiserModule>();
128 ICollection<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>(); 128 ICollection<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
129 129
130 foreach (string serialisedSceneObject in serialisedSceneObjects) 130 foreach (string serialisedSceneObject in serialisedSceneObjects)
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs
index 5b4d9e5..73fa5d2 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
54 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 54 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
55 55
56 protected ITerrainModule m_terrainModule; 56 protected ITerrainModule m_terrainModule;
57 protected IRegionSerialiser m_serialiser; 57 protected IRegionSerialiserModule m_serialiser;
58 protected List<SceneObjectGroup> m_sceneObjects; 58 protected List<SceneObjectGroup> m_sceneObjects;
59 protected string m_sceneName; 59 protected string m_sceneName;
60 protected string m_savePath; 60 protected string m_savePath;
@@ -62,7 +62,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
62 public ArchiveWriteRequestExecution( 62 public ArchiveWriteRequestExecution(
63 List<SceneObjectGroup> sceneObjects, 63 List<SceneObjectGroup> sceneObjects,
64 ITerrainModule terrainModule, 64 ITerrainModule terrainModule,
65 IRegionSerialiser serialiser, 65 IRegionSerialiserModule serialiser,
66 string sceneName, 66 string sceneName,
67 string savePath) 67 string savePath)
68 { 68 {
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
index bb3a18d..9cf6bf5 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -287,7 +287,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
287 = new ArchiveWriteRequestExecution( 287 = new ArchiveWriteRequestExecution(
288 sceneObjects, 288 sceneObjects,
289 m_scene.RequestModuleInterface<ITerrainModule>(), 289 m_scene.RequestModuleInterface<ITerrainModule>(),
290 m_scene.RequestModuleInterface<IRegionSerialiser>(), 290 m_scene.RequestModuleInterface<IRegionSerialiserModule>(),
291 m_scene.RegionInfo.RegionName, 291 m_scene.RegionInfo.RegionName,
292 m_savePath); 292 m_savePath);
293 new AssetsRequest(assetUuids.Keys, m_scene.AssetCache, awre.ReceivedAllAssets).Execute(); 293 new AssetsRequest(assetUuids.Keys, m_scene.AssetCache, awre.ReceivedAllAssets).Execute();
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
index e3eb377..8b5dd2c 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
@@ -36,7 +36,7 @@ using OpenSim.Region.Environment.Scenes;
36 36
37namespace OpenSim.Region.Environment.Modules.World.Serialiser 37namespace OpenSim.Region.Environment.Modules.World.Serialiser
38{ 38{
39 public class SerialiserModule : IRegionModule, IRegionSerialiser 39 public class SerialiserModule : IRegionModule, IRegionSerialiserModule
40 { 40 {
41 private Commander m_commander = new Commander("Export"); 41 private Commander m_commander = new Commander("Export");
42 private List<Scene> m_regions = new List<Scene>(); 42 private List<Scene> m_regions = new List<Scene>();
@@ -49,7 +49,7 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser
49 { 49 {
50 scene.RegisterModuleCommander("Export", m_commander); 50 scene.RegisterModuleCommander("Export", m_commander);
51 scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole; 51 scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;
52 scene.RegisterModuleInterface<IRegionSerialiser>(this); 52 scene.RegisterModuleInterface<IRegionSerialiserModule>(this);
53 53
54 lock (m_regions) 54 lock (m_regions)
55 { 55 {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 4272f22..fec89da 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -142,7 +142,7 @@ namespace OpenSim.Region.Environment.Scenes
142 protected IWorldComm m_worldCommModule; 142 protected IWorldComm m_worldCommModule;
143 protected IAvatarFactory m_AvatarFactory; 143 protected IAvatarFactory m_AvatarFactory;
144 protected IConfigSource m_config; 144 protected IConfigSource m_config;
145 protected IRegionSerialiser m_serialiser; 145 protected IRegionSerialiserModule m_serialiser;
146 146
147 // Central Update Loop 147 // Central Update Loop
148 148
@@ -728,7 +728,7 @@ namespace OpenSim.Region.Environment.Scenes
728 m_worldCommModule = RequestModuleInterface<IWorldComm>(); 728 m_worldCommModule = RequestModuleInterface<IWorldComm>();
729 XferManager = RequestModuleInterface<IXfer>(); 729 XferManager = RequestModuleInterface<IXfer>();
730 m_AvatarFactory = RequestModuleInterface<IAvatarFactory>(); 730 m_AvatarFactory = RequestModuleInterface<IAvatarFactory>();
731 m_serialiser = RequestModuleInterface<IRegionSerialiser>(); 731 m_serialiser = RequestModuleInterface<IRegionSerialiserModule>();
732 } 732 }
733 733
734 #endregion 734 #endregion
diff --git a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
index b87954c..f90c697 100644
--- a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
+++ b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Modules.SvnSerialiser
50 50
51 private bool m_enabled = false; 51 private bool m_enabled = false;
52 private bool m_installBackupOnLoad = false; 52 private bool m_installBackupOnLoad = false;
53 private IRegionSerialiser m_serialiser; 53 private IRegionSerialiserModule m_serialiser;
54 private bool m_svnAutoSave = false; 54 private bool m_svnAutoSave = false;
55 private SvnClient m_svnClient; 55 private SvnClient m_svnClient;
56 private string m_svndir = "SVNmodule" + Slash.DirectorySeparatorChar + "repo"; 56 private string m_svndir = "SVNmodule" + Slash.DirectorySeparatorChar + "repo";
@@ -360,7 +360,7 @@ namespace OpenSim.Region.Modules.SvnSerialiser
360 private void SetupSerialiser() 360 private void SetupSerialiser()
361 { 361 {
362 if (m_scenes.Count > 0) 362 if (m_scenes.Count > 0)
363 m_serialiser = m_scenes[0].RequestModuleInterface<IRegionSerialiser>(); 363 m_serialiser = m_scenes[0].RequestModuleInterface<IRegionSerialiserModule>();
364 } 364 }
365 365
366 private void SetupSvnProvider() 366 private void SetupSvnProvider()