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/Data/MySQL/MySQLSimulationData.cs | 6 +++---
 OpenSim/Data/Null/NullSimulationData.cs   | 2 +-
 OpenSim/Data/PGSQL/PGSQLSimulationData.cs | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Data')

diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index c09154d..c5d7c47 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -598,7 +598,7 @@ namespace OpenSim.Data.MySQL
         // Legacy entry point for when terrain was always a 256x256 hieghtmap
         public void StoreTerrain(double[,] ter, UUID regionID)
         {
-            StoreTerrain(new HeightmapTerrainData(ter), regionID);
+            StoreTerrain(new TerrainData(ter), regionID);
         }
 
         public void StoreTerrain(TerrainData terrData, UUID regionID)
@@ -1463,7 +1463,7 @@ namespace OpenSim.Data.MySQL
             if (!(row["DynAttrs"] is System.DBNull))
                 prim.DynAttrs = DAMap.FromXml((string)row["DynAttrs"]);
             else
-                prim.DynAttrs = new DAMap();
+                prim.DynAttrs = null;
 
             if (!(row["KeyframeMotion"] is DBNull))
             {
@@ -1880,7 +1880,7 @@ namespace OpenSim.Data.MySQL
             else
                 cmd.Parameters.AddWithValue("Vehicle", String.Empty);
 
-            if (prim.DynAttrs.CountNamespaces > 0)
+            if (prim.DynAttrs != null && prim.DynAttrs.CountNamespaces > 0)
                 cmd.Parameters.AddWithValue("DynAttrs", prim.DynAttrs.ToXml());
             else
                 cmd.Parameters.AddWithValue("DynAttrs", null);
diff --git a/OpenSim/Data/Null/NullSimulationData.cs b/OpenSim/Data/Null/NullSimulationData.cs
index 7bb6da3..97e4b79 100644
--- a/OpenSim/Data/Null/NullSimulationData.cs
+++ b/OpenSim/Data/Null/NullSimulationData.cs
@@ -151,7 +151,7 @@ namespace OpenSim.Data.Null
         // Legacy. Just don't do this.
         public void StoreTerrain(double[,] ter, UUID regionID)
         {
-            TerrainData terrData = new HeightmapTerrainData(ter);
+            TerrainData terrData = new TerrainData(ter);
             StoreTerrain(terrData, regionID);
         }
 
diff --git a/OpenSim/Data/PGSQL/PGSQLSimulationData.cs b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
index 35cd723..569cc80 100755
--- a/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
@@ -610,7 +610,7 @@ namespace OpenSim.Data.PGSQL
         // Legacy entry point for when terrain was always a 256x256 heightmap
         public void StoreTerrain(double[,] terrain, UUID regionID)
         {
-            StoreTerrain(new HeightmapTerrainData(terrain), regionID);
+            StoreTerrain(new TerrainData(terrain), regionID);
         }
 
         /// <summary>
@@ -1797,7 +1797,7 @@ namespace OpenSim.Data.PGSQL
             if (!(primRow["DynAttrs"] is System.DBNull) && (string)primRow["DynAttrs"] != "")
                 prim.DynAttrs = DAMap.FromXml((string)primRow["DynAttrs"]);
             else
-                prim.DynAttrs = new DAMap();
+                prim.DynAttrs = null;
 
             prim.PhysicsShapeType = Convert.ToByte(primRow["PhysicsShapeType"]);
             prim.Density = Convert.ToSingle(primRow["Density"]);
@@ -2245,7 +2245,7 @@ namespace OpenSim.Data.PGSQL
             else
                 parameters.Add(_Database.CreateParameter("PhysInertia", String.Empty));
 
-            if (prim.DynAttrs.CountNamespaces > 0)
+            if (prim.DynAttrs != null && prim.DynAttrs.CountNamespaces > 0)
                 parameters.Add(_Database.CreateParameter("DynAttrs", prim.DynAttrs.ToXml()));
             else
                 parameters.Add(_Database.CreateParameter("DynAttrs", null));
-- 
cgit v1.1