OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

another missing file

0.9.1.0-post-fixes
UbitUmarov 2019-01-21 06:14:41 +00:00
parent fad63ca814
commit da0ea2698b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Data/SQLite/SQLiteSimulationData.cs
View File

@ -823,7 +823,7 @@ namespace OpenSim.Data.SQLite
// Legacy entry point for when terrain was always a 256x256 hieghtmap // Legacy entry point for when terrain was always a 256x256 hieghtmap
public void StoreTerrain(double[,] ter, UUID regionID) public void StoreTerrain(double[,] ter, UUID regionID)
{ {
StoreTerrain(new HeightmapTerrainData(ter), regionID); StoreTerrain(new TerrainData(ter), regionID);
} }
/// <summary> /// <summary>
@ -835,8 +835,7 @@ namespace OpenSim.Data.SQLite
{ {
lock (ds) lock (ds)
{ {
using ( using (SqliteCommand cmd = new SqliteCommand("delete from terrain where RegionUUID=:RegionUUID", m_conn))
SqliteCommand cmd = new SqliteCommand("delete from terrain where RegionUUID=:RegionUUID", m_conn))
{ {
cmd.Parameters.Add(new SqliteParameter(":RegionUUID", regionID.ToString())); cmd.Parameters.Add(new SqliteParameter(":RegionUUID", regionID.ToString()));
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
@ -1809,7 +1808,7 @@ namespace OpenSim.Data.SQLite
} }
else else
{ {
prim.DynAttrs = new DAMap(); prim.DynAttrs = null;
} }
prim.PhysicsShapeType = Convert.ToByte(row["PhysicsShapeType"]); prim.PhysicsShapeType = Convert.ToByte(row["PhysicsShapeType"]);
@ -2247,7 +2246,7 @@ namespace OpenSim.Data.SQLite
row["AttachedPosY"] = prim.AttachedPos.Y; row["AttachedPosY"] = prim.AttachedPos.Y;
row["AttachedPosZ"] = prim.AttachedPos.Z; row["AttachedPosZ"] = prim.AttachedPos.Z;
if (prim.DynAttrs.CountNamespaces > 0) if (prim.DynAttrs!= null && prim.DynAttrs.CountNamespaces > 0)
row["DynAttrs"] = prim.DynAttrs.ToXml(); row["DynAttrs"] = prim.DynAttrs.ToXml();
else else
row["DynAttrs"] = null; row["DynAttrs"] = null;