diff options
author | UbitUmarov | 2019-01-21 06:14:41 +0000 |
---|---|---|
committer | UbitUmarov | 2019-01-21 06:14:41 +0000 |
commit | da0ea2698bb4412ebd4f98bf932813194ea8495d (patch) | |
tree | 2ee230a7b63c84a3b316d1c28cfe26bf1f36c6b5 /OpenSim | |
parent | missing file (diff) | |
download | opensim-SC-da0ea2698bb4412ebd4f98bf932813194ea8495d.zip opensim-SC-da0ea2698bb4412ebd4f98bf932813194ea8495d.tar.gz opensim-SC-da0ea2698bb4412ebd4f98bf932813194ea8495d.tar.bz2 opensim-SC-da0ea2698bb4412ebd4f98bf932813194ea8495d.tar.xz |
another missing file
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index 19880de..e02ac7d 100644 --- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs | |||
@@ -823,7 +823,7 @@ namespace OpenSim.Data.SQLite | |||
823 | // Legacy entry point for when terrain was always a 256x256 hieghtmap | 823 | // Legacy entry point for when terrain was always a 256x256 hieghtmap |
824 | public void StoreTerrain(double[,] ter, UUID regionID) | 824 | public void StoreTerrain(double[,] ter, UUID regionID) |
825 | { | 825 | { |
826 | StoreTerrain(new HeightmapTerrainData(ter), regionID); | 826 | StoreTerrain(new TerrainData(ter), regionID); |
827 | } | 827 | } |
828 | 828 | ||
829 | /// <summary> | 829 | /// <summary> |
@@ -835,8 +835,7 @@ namespace OpenSim.Data.SQLite | |||
835 | { | 835 | { |
836 | lock (ds) | 836 | lock (ds) |
837 | { | 837 | { |
838 | using ( | 838 | using (SqliteCommand cmd = new SqliteCommand("delete from terrain where RegionUUID=:RegionUUID", m_conn)) |
839 | SqliteCommand cmd = new SqliteCommand("delete from terrain where RegionUUID=:RegionUUID", m_conn)) | ||
840 | { | 839 | { |
841 | cmd.Parameters.Add(new SqliteParameter(":RegionUUID", regionID.ToString())); | 840 | cmd.Parameters.Add(new SqliteParameter(":RegionUUID", regionID.ToString())); |
842 | cmd.ExecuteNonQuery(); | 841 | cmd.ExecuteNonQuery(); |
@@ -1809,7 +1808,7 @@ namespace OpenSim.Data.SQLite | |||
1809 | } | 1808 | } |
1810 | else | 1809 | else |
1811 | { | 1810 | { |
1812 | prim.DynAttrs = new DAMap(); | 1811 | prim.DynAttrs = null; |
1813 | } | 1812 | } |
1814 | 1813 | ||
1815 | prim.PhysicsShapeType = Convert.ToByte(row["PhysicsShapeType"]); | 1814 | prim.PhysicsShapeType = Convert.ToByte(row["PhysicsShapeType"]); |
@@ -2247,7 +2246,7 @@ namespace OpenSim.Data.SQLite | |||
2247 | row["AttachedPosY"] = prim.AttachedPos.Y; | 2246 | row["AttachedPosY"] = prim.AttachedPos.Y; |
2248 | row["AttachedPosZ"] = prim.AttachedPos.Z; | 2247 | row["AttachedPosZ"] = prim.AttachedPos.Z; |
2249 | 2248 | ||
2250 | if (prim.DynAttrs.CountNamespaces > 0) | 2249 | if (prim.DynAttrs!= null && prim.DynAttrs.CountNamespaces > 0) |
2251 | row["DynAttrs"] = prim.DynAttrs.ToXml(); | 2250 | row["DynAttrs"] = prim.DynAttrs.ToXml(); |
2252 | else | 2251 | else |
2253 | row["DynAttrs"] = null; | 2252 | row["DynAttrs"] = null; |