diff options
author | Melanie | 2010-09-26 20:03:00 +0100 |
---|---|---|
committer | Melanie | 2010-09-26 20:03:00 +0100 |
commit | dc49057c8a1cf99590aa3df25d4888d6dea54eaa (patch) | |
tree | 2ee56fee19a9bf4591989e840c253eaf4d6fbd6e /OpenSim/Region/CoreModules/World/Serialiser/SerialiseTerrain.cs | |
parent | Another typo fix (diff) | |
download | opensim-SC_OLD-dc49057c8a1cf99590aa3df25d4888d6dea54eaa.zip opensim-SC_OLD-dc49057c8a1cf99590aa3df25d4888d6dea54eaa.tar.gz opensim-SC_OLD-dc49057c8a1cf99590aa3df25d4888d6dea54eaa.tar.bz2 opensim-SC_OLD-dc49057c8a1cf99590aa3df25d4888d6dea54eaa.tar.xz |
Consistency patch: use Path.Combine() instead of + and eliminate the need
for a trailing slash on exports/
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Serialiser/SerialiseTerrain.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiseTerrain.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseTerrain.cs index 5cbe66b..c04753d 100644 --- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiseTerrain.cs +++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseTerrain.cs | |||
@@ -28,6 +28,7 @@ | |||
28 | using OpenSim.Region.CoreModules.World.Terrain; | 28 | using OpenSim.Region.CoreModules.World.Terrain; |
29 | using OpenSim.Region.CoreModules.World.Terrain.FileLoaders; | 29 | using OpenSim.Region.CoreModules.World.Terrain.FileLoaders; |
30 | using OpenSim.Region.Framework.Scenes; | 30 | using OpenSim.Region.Framework.Scenes; |
31 | using System.IO; | ||
31 | 32 | ||
32 | namespace OpenSim.Region.CoreModules.World.Serialiser | 33 | namespace OpenSim.Region.CoreModules.World.Serialiser |
33 | { | 34 | { |
@@ -38,7 +39,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser | |||
38 | public string WriteToFile(Scene scene, string dir) | 39 | public string WriteToFile(Scene scene, string dir) |
39 | { | 40 | { |
40 | ITerrainLoader fileSystemExporter = new RAW32(); | 41 | ITerrainLoader fileSystemExporter = new RAW32(); |
41 | string targetFileName = dir + "heightmap.r32"; | 42 | string targetFileName = Path.Combine(dir, "heightmap.r32"); |
42 | 43 | ||
43 | lock (scene.Heightmap) | 44 | lock (scene.Heightmap) |
44 | { | 45 | { |
@@ -50,4 +51,4 @@ namespace OpenSim.Region.CoreModules.World.Serialiser | |||
50 | 51 | ||
51 | #endregion | 52 | #endregion |
52 | } | 53 | } |
53 | } \ No newline at end of file | 54 | } |