* Disabled ancient TerrainEngine.

* Enabled new TerrainModule.  (The king is dead, long live the king!)
* Use the console command: "script terrain save file.r32" / "script terrain load file.r32" to load/save terrain. Now uses the extension to determine file format.
* MANY of the old terrain features do not have a replacement function in the new module yet, this needs to be corrected, but has not been done so far. This being said, the new module is faster and more efficient and should be a good replacement.

1 files changed, 2 insertions, 11 deletions

diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 2a2dea1..12635c8 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Environment.Scenes
         protected string m_regionName;
         protected RegionInfo m_regInfo;
 
-        public TerrainEngine Terrain;
+        //public TerrainEngine Terrain;
         public ITerrainChannel Heightmap;
 
         protected EventManager m_eventManager;
@@ -112,16 +112,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="RemoteClient">Client to send to</param>
         public virtual void SendLayerData(IClientAPI RemoteClient)
         {
-            bool usingTerrainModule = false;
-
-            if (usingTerrainModule)
-            {
-                RemoteClient.SendLayerData(Heightmap.GetFloatsSerialised());
-            }
-            else
-            {
-                RemoteClient.SendLayerData(Terrain.GetHeights1D());
-            }
+            RemoteClient.SendLayerData(Heightmap.GetFloatsSerialised());
         }
 
         #endregion