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

Don't allow deletion of a terrain from the database unless we have one to replace it with

avinationmerge
Melanie 2011-12-05 15:46:57 +01:00
parent 68bdd0b7fe
commit b7c9eb4bf7
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/Data/MySQL/MySQLSimulationData.cs
View File

@ -574,15 +574,29 @@ namespace OpenSim.Data.MySQL
cmd.CommandText = "delete from terrain where RegionUUID = ?RegionUUID"; cmd.CommandText = "delete from terrain where RegionUUID = ?RegionUUID";
cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString()); cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
ExecuteNonQuery(cmd); using (MySqlCommand cmd2 = dbcon.CreateCommand())
{
cmd.CommandText = "insert into terrain (RegionUUID, " + try
{
cmd2.CommandText = "insert into terrain (RegionUUID, " +
"Revision, Heightfield) values (?RegionUUID, " + "Revision, Heightfield) values (?RegionUUID, " +
"1, ?Heightfield)"; "1, ?Heightfield)";
cmd.Parameters.AddWithValue("Heightfield", SerializeTerrain(ter)); cmd2.Parameters.AddWithValue("RegionUUID", regionID.ToString());
cmd2.Parameters.AddWithValue("Heightfield", SerializeTerrain(ter));
ExecuteNonQuery(cmd); ExecuteNonQuery(cmd);
ExecuteNonQuery(cmd2);
}
catch
{
// If we get here there is a NaN in the terrain
// and the terrain can't be saved. A crash here
// is much better than losing all the work
m_log.ErrorFormat("[DATA]: Unable to save terrain. Stopping simulator to prevent data loss");
Environment.Exit(1);
}
}
} }
} }
} }