From 33a062612f9fafcb7b4c0e8ac60937c448ce3c10 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Mon, 21 Jan 2019 06:05:21 +0000
Subject: remove terraindata abstraction layer, since we only have heightmap
 type

---
 OpenSim/Region/Framework/Scenes/TerrainChannel.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/TerrainChannel.cs')

diff --git a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
index 92fd314..96d2dc4 100644
--- a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
+++ b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Region.Framework.Scenes
         // Default, not-often-used builder
         public TerrainChannel()
         {
-            m_terrainData = new HeightmapTerrainData((int)Constants.RegionSize, (int)Constants.RegionSize, (int)Constants.RegionHeight);
+            m_terrainData = new TerrainData((int)Constants.RegionSize, (int)Constants.RegionSize, (int)Constants.RegionHeight);
             FlatLand();
             // PinHeadIsland();
         }
@@ -69,14 +69,14 @@ namespace OpenSim.Region.Framework.Scenes
         // Create terrain of given size
         public TerrainChannel(int pX, int pY)
         {
-            m_terrainData = new HeightmapTerrainData(pX, pY, (int)Constants.RegionHeight);
+            m_terrainData = new TerrainData(pX, pY, (int)Constants.RegionHeight);
         }
 
         // Create terrain of specified size and initialize with specified terrain.
         // TODO: join this with the terrain initializers.
         public TerrainChannel(String type, int pX, int pY, int pZ)
         {
-            m_terrainData = new HeightmapTerrainData(pX, pY, pZ);
+            m_terrainData = new TerrainData(pX, pY, pZ);
             if (type.Equals("flat"))
                 FlatLand();
             else
@@ -90,7 +90,7 @@ namespace OpenSim.Region.Framework.Scenes
             int hmSizeX = pM.GetLength(0);
             int hmSizeY = pM.GetLength(1);
 
-            m_terrainData = new HeightmapTerrainData(pSizeX, pSizeY, pAltitude);
+            m_terrainData = new TerrainData(pSizeX, pSizeY, pAltitude);
 
             for (int xx = 0; xx < pSizeX; xx++)
                 for (int yy = 0; yy < pSizeY; yy++)
@@ -309,7 +309,7 @@ namespace OpenSim.Region.Framework.Scenes
             int tmpY = baseY + baseY / 2;
             int centreX = tmpX / 2;
             int centreY = tmpY / 2;
-            TerrainData terrain_tmp = new HeightmapTerrainData(tmpX, tmpY, (int)Constants.RegionHeight);
+            TerrainData terrain_tmp = new TerrainData(tmpX, tmpY, (int)Constants.RegionHeight);
             for (int xx = 0; xx < tmpX; xx++)
                 for (int yy = 0; yy < tmpY; yy++)
                     terrain_tmp[xx, yy] = -65535f; //use this height like an 'alpha' mask channel
@@ -483,7 +483,7 @@ namespace OpenSim.Region.Framework.Scenes
             byte[] dataArray = (byte[])serializer.Deserialize(xmlReader);
             int index = 0;
 
-            m_terrainData = new HeightmapTerrainData(Height, Width, (int)Constants.RegionHeight);
+            m_terrainData = new TerrainData(Height, Width, (int)Constants.RegionHeight);
 
             for (int y = 0; y < Height; y++)
             {
@@ -530,7 +530,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             XmlSerializer serializer = new XmlSerializer(typeof(TerrainChannelXMLPackage));
             TerrainChannelXMLPackage package = (TerrainChannelXMLPackage)serializer.Deserialize(xmlReader);
-            m_terrainData = new HeightmapTerrainData(package.Map, package.CompressionFactor, package.SizeX, package.SizeY, package.SizeZ);
+            m_terrainData = new TerrainData(package.Map, package.CompressionFactor, package.SizeX, package.SizeY, package.SizeZ);
         }
 
         // Fill the heightmap with the center bump terrain
-- 
cgit v1.1