aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2008-03-08 01:58:59 +0000
committerAdam Frisby2008-03-08 01:58:59 +0000
commite41b45d10751d1f782d57cc031486868a4d1965e (patch)
treec6a2410d61dc73bc2357e7240ba3f2aae21942a8
parent* Default terrain is now a little more interesting than a flat 0m plane. (diff)
downloadopensim-SC_OLD-e41b45d10751d1f782d57cc031486868a4d1965e.zip
opensim-SC_OLD-e41b45d10751d1f782d57cc031486868a4d1965e.tar.gz
opensim-SC_OLD-e41b45d10751d1f782d57cc031486868a4d1965e.tar.bz2
opensim-SC_OLD-e41b45d10751d1f782d57cc031486868a4d1965e.tar.xz
* Made a change to the loading mechanism to fix it's operation.
-rw-r--r--OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs b/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
index 9435e9b..15c6dcf 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
@@ -224,7 +224,12 @@ namespace OpenSim.Region.Environment.Modules.Terrain
224 { 224 {
225 if (filename.EndsWith(loader.Key)) 225 if (filename.EndsWith(loader.Key))
226 { 226 {
227 loader.Value.LoadFile(filename); 227 lock (m_scene)
228 {
229 ITerrainChannel channel = loader.Value.LoadFile(filename);
230 m_scene.Heightmap = channel;
231 m_channel = channel;
232 }
228 return; 233 return;
229 } 234 }
230 } 235 }