* Removed and sorted using clauses in a number of files.

* Cleaned up ITerrainChannel
* Implemented Raise, Lower, Smooth, Flatten, Noise Terrain Paint Brushes
* Implemented Raise, Lower, Smooth, Flatten, Noise Terrain Fill Brushes
* Implemented Export functionality for RAW32 terrain loader
* Implemented Import/Export for SLRAW terrain loader
* Implemented Export for JPEG terrain loader

2 files changed, 12 insertions, 3 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index a20e466..845de22 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -31,14 +31,12 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.Threading;
 using System.Timers;
-using Axiom.Math;
 using libsecondlife;
 using libsecondlife.Packets;
 using OpenJPEGNet;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.LandManagement;
@@ -1002,6 +1000,8 @@ namespace OpenSim.Region.Environment.Scenes
                 }
                 else
                 {
+                    // TODO: Install 'GetDefaultTerrainProvider' method here?
+                    Heightmap = new Modules.Terrain.TerrainChannel(map);
                     Terrain.SetHeights2D(map);
                 }
 
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 3f7edfb..2a2dea1 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -112,7 +112,16 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="RemoteClient">Client to send to</param>
         public virtual void SendLayerData(IClientAPI RemoteClient)
         {
-            RemoteClient.SendLayerData(Terrain.GetHeights1D());
+            bool usingTerrainModule = false;
+
+            if (usingTerrainModule)
+            {
+                RemoteClient.SendLayerData(Heightmap.GetFloatsSerialised());
+            }
+            else
+            {
+                RemoteClient.SendLayerData(Terrain.GetHeights1D());
+            }
         }
 
         #endregion