From e41b45d10751d1f782d57cc031486868a4d1965e Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Sat, 8 Mar 2008 01:58:59 +0000
Subject: * Made a change to the loading mechanism to fix it's operation.

---
 OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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
             {
                 if (filename.EndsWith(loader.Key))
                 {
-                    loader.Value.LoadFile(filename);
+                    lock (m_scene)
+                    {
+                        ITerrainChannel channel = loader.Value.LoadFile(filename);
+                        m_scene.Heightmap = channel;
+                        m_channel = channel;
+                    }
                     return;
                 }
             }
-- 
cgit v1.1