diff options
author | Adam Frisby | 2008-04-21 07:09:17 +0000 |
---|---|---|
committer | Adam Frisby | 2008-04-21 07:09:17 +0000 |
commit | fef3b3689492dea63693c964bcdbec9f5137eb5e (patch) | |
tree | 7791eef001d85d3e1de863a68f26ff9434d062ca /OpenSim/Region/Environment/Modules/ExportSerialiser | |
parent | * Terrain Module code has been reformatted to comply with guidelines. (diff) | |
download | opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.zip opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.gz opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.bz2 opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.xz |
* Optimised using statements and namespace references across entire project (this took a while to run).
Diffstat (limited to '')
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 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Drawing; | 30 | using System.IO; |
31 | using libsecondlife; | ||
32 | using Nini.Config; | 31 | using Nini.Config; |
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Region.Environment.Interfaces; | 32 | using OpenSim.Region.Environment.Interfaces; |
35 | using OpenSim.Region.Environment.Scenes; | ||
36 | using OpenSim.Region.Environment.Modules.ModuleFramework; | 33 | using OpenSim.Region.Environment.Modules.ModuleFramework; |
37 | using System.IO; | 34 | using OpenSim.Region.Environment.Scenes; |
38 | 35 | ||
39 | namespace OpenSim.Region.Environment.Modules.ExportSerialiser | 36 | namespace 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 | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | using OpenSim.Region.Environment.Scenes; | 28 | using OpenSim.Region.Environment.Scenes; |
33 | 29 | ||
34 | namespace OpenSim.Region.Environment.Modules.ExportSerialiser | 30 | namespace 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 | ||
28 | using System; | 28 | using System.Collections.Generic; |
29 | using OpenSim.Region.Environment.Scenes; | ||
30 | |||
29 | namespace OpenSim.Region.Environment.Modules.ExportSerialiser | 31 | namespace 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 | ||
28 | using OpenSim.Region.Environment.Scenes; | ||
29 | using System.IO; | ||
30 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.IO; | ||
30 | using System.Text; | ||
31 | using System.Xml; | 31 | using System.Xml; |
32 | using OpenSim.Region.Environment.Scenes; | ||
32 | 33 | ||
33 | namespace OpenSim.Region.Environment.Modules.ExportSerialiser | 34 | namespace 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 | ||
28 | using OpenSim.Region.Environment.Modules.Terrain; | 28 | using OpenSim.Region.Environment.Modules.Terrain; |
29 | using OpenSim.Region.Environment.Modules.Terrain.FileLoaders; | ||
29 | using OpenSim.Region.Environment.Scenes; | 30 | using OpenSim.Region.Environment.Scenes; |
30 | 31 | ||
31 | namespace OpenSim.Region.Environment.Modules.ExportSerialiser | 32 | namespace 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) |