aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/ExportSerialiser
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Modules/ExportSerialiser')
-rw-r--r--OpenSim/Region/Environment/Modules/ExportSerialiser/ExportSerialisationModule.cs9
-rw-r--r--OpenSim/Region/Environment/Modules/ExportSerialiser/IFileSerialiser.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/ExportSerialiser/IRegionSerialiser.cs6
-rw-r--r--OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseObjects.cs7
-rw-r--r--OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseTerrain.cs3
5 files changed, 13 insertions, 16 deletions
diff --git a/OpenSim/Region/Environment/Modules/ExportSerialiser/ExportSerialisationModule.cs b/OpenSim/Region/Environment/Modules/ExportSerialiser/ExportSerialisationModule.cs
index 0faa573..f811f22 100644
--- a/OpenSim/Region/Environment/Modules/ExportSerialiser/ExportSerialisationModule.cs
+++ b/OpenSim/Region/Environment/Modules/ExportSerialiser/ExportSerialisationModule.cs
@@ -27,18 +27,15 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Drawing; 30using System.IO;
31using libsecondlife;
32using Nini.Config; 31using Nini.Config;
33using OpenSim.Framework;
34using OpenSim.Region.Environment.Interfaces; 32using OpenSim.Region.Environment.Interfaces;
35using OpenSim.Region.Environment.Scenes;
36using OpenSim.Region.Environment.Modules.ModuleFramework; 33using OpenSim.Region.Environment.Modules.ModuleFramework;
37using System.IO; 34using OpenSim.Region.Environment.Scenes;
38 35
39namespace OpenSim.Region.Environment.Modules.ExportSerialiser 36namespace OpenSim.Region.Environment.Modules.ExportSerialiser
40{ 37{
41 public class ExportSerialisationModule : IRegionModule, OpenSim.Region.Environment.Modules.ExportSerialiser.IRegionSerialiser 38 public class ExportSerialisationModule : IRegionModule, IRegionSerialiser
42 { 39 {
43 private List<Scene> m_regions = new List<Scene>(); 40 private List<Scene> m_regions = new List<Scene>();
44 private List<IFileSerialiser> m_serialisers = new List<IFileSerialiser>(); 41 private List<IFileSerialiser> m_serialisers = new List<IFileSerialiser>();
diff --git a/OpenSim/Region/Environment/Modules/ExportSerialiser/IFileSerialiser.cs b/OpenSim/Region/Environment/Modules/ExportSerialiser/IFileSerialiser.cs
index f13c8fa..8cd97a8 100644
--- a/OpenSim/Region/Environment/Modules/ExportSerialiser/IFileSerialiser.cs
+++ b/OpenSim/Region/Environment/Modules/ExportSerialiser/IFileSerialiser.cs
@@ -25,10 +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 System;
29using System.Collections.Generic;
30using System.Text;
31
32using OpenSim.Region.Environment.Scenes; 28using OpenSim.Region.Environment.Scenes;
33 29
34namespace OpenSim.Region.Environment.Modules.ExportSerialiser 30namespace OpenSim.Region.Environment.Modules.ExportSerialiser
diff --git a/OpenSim/Region/Environment/Modules/ExportSerialiser/IRegionSerialiser.cs b/OpenSim/Region/Environment/Modules/ExportSerialiser/IRegionSerialiser.cs
index a9454fc..5b10957 100644
--- a/OpenSim/Region/Environment/Modules/ExportSerialiser/IRegionSerialiser.cs
+++ b/OpenSim/Region/Environment/Modules/ExportSerialiser/IRegionSerialiser.cs
@@ -25,11 +25,13 @@
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 System; 28using System.Collections.Generic;
29using OpenSim.Region.Environment.Scenes;
30
29namespace OpenSim.Region.Environment.Modules.ExportSerialiser 31namespace OpenSim.Region.Environment.Modules.ExportSerialiser
30{ 32{
31 public interface IRegionSerialiser 33 public interface IRegionSerialiser
32 { 34 {
33 System.Collections.Generic.List<string> SerialiseRegion(OpenSim.Region.Environment.Scenes.Scene scene, string saveDir); 35 List<string> SerialiseRegion(Scene scene, string saveDir);
34 } 36 }
35} 37}
diff --git a/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseObjects.cs b/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseObjects.cs
index e413466..ac80f40 100644
--- a/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseObjects.cs
+++ b/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseObjects.cs
@@ -25,10 +25,11 @@
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.Region.Environment.Scenes;
29using System.IO;
30using System.Collections.Generic; 28using System.Collections.Generic;
29using System.IO;
30using System.Text;
31using System.Xml; 31using System.Xml;
32using OpenSim.Region.Environment.Scenes;
32 33
33namespace OpenSim.Region.Environment.Modules.ExportSerialiser 34namespace OpenSim.Region.Environment.Modules.ExportSerialiser
34{ 35{
@@ -61,7 +62,7 @@ namespace OpenSim.Region.Environment.Modules.ExportSerialiser
61 xmlstream += "</scene>"; 62 xmlstream += "</scene>";
62 63
63 MemoryStream stream = new MemoryStream(); 64 MemoryStream stream = new MemoryStream();
64 XmlTextWriter formatter = new XmlTextWriter(stream, System.Text.Encoding.UTF8); 65 XmlTextWriter formatter = new XmlTextWriter(stream, Encoding.UTF8);
65 XmlDocument doc = new XmlDocument(); 66 XmlDocument doc = new XmlDocument();
66 67
67 doc.LoadXml(xmlstream); 68 doc.LoadXml(xmlstream);
diff --git a/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseTerrain.cs b/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseTerrain.cs
index eeeacdc..8555089 100644
--- a/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseTerrain.cs
+++ b/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseTerrain.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using OpenSim.Region.Environment.Modules.Terrain; 28using OpenSim.Region.Environment.Modules.Terrain;
29using OpenSim.Region.Environment.Modules.Terrain.FileLoaders;
29using OpenSim.Region.Environment.Scenes; 30using OpenSim.Region.Environment.Scenes;
30 31
31namespace OpenSim.Region.Environment.Modules.ExportSerialiser 32namespace OpenSim.Region.Environment.Modules.ExportSerialiser
@@ -36,7 +37,7 @@ namespace OpenSim.Region.Environment.Modules.ExportSerialiser
36 37
37 public string WriteToFile(Scene scene, string dir) 38 public string WriteToFile(Scene scene, string dir)
38 { 39 {
39 ITerrainLoader fileSystemExporter = new Terrain.FileLoaders.RAW32(); 40 ITerrainLoader fileSystemExporter = new RAW32();
40 string targetFileName = dir + "heightmap.r32"; 41 string targetFileName = dir + "heightmap.r32";
41 42
42 lock (scene.Heightmap) 43 lock (scene.Heightmap)