From 754c244f468a038be2417ed611e5bf3fb962a987 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 11 Feb 2011 23:06:14 +0000
Subject: In SQLiteSimulationData.RemoveLandObject(), don't manually remove the
row from the data adaptor's Rows list in addition to calling Delete.
This matches the behaviour for other deletions and stops this operation failing on Windows .NET (though mono is fine with the duplication).
Probably a holdover from copying code from the older legacy adaptor.
Resolves http://opensimulator.org/mantis/view.php?id=5361
---
OpenSim/Data/SQLite/SQLiteSimulationData.cs | 6 ------
bin/sqlite3.dll | Bin 505771 -> 559244 bytes
2 files changed, 6 deletions(-)
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index 8d93354..377c680 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -669,10 +669,6 @@ namespace OpenSim.Data.SQLite
}
}
- ///
- ///
- ///
- ///
public void RemoveLandObject(UUID globalID)
{
lock (ds)
@@ -698,7 +694,6 @@ namespace OpenSim.Data.SQLite
if (landRow != null)
{
landRow.Delete();
- land.Rows.Remove(landRow);
}
List rowsToDelete = new List();
foreach (DataRow rowToCheck in landaccesslist.Rows)
@@ -709,7 +704,6 @@ namespace OpenSim.Data.SQLite
for (int iter = 0; iter < rowsToDelete.Count; iter++)
{
rowsToDelete[iter].Delete();
- landaccesslist.Rows.Remove(rowsToDelete[iter]);
}
}
Commit();
diff --git a/bin/sqlite3.dll b/bin/sqlite3.dll
index 558a015..f29dc62 100755
Binary files a/bin/sqlite3.dll and b/bin/sqlite3.dll differ
--
cgit v1.1