diff options
author | Justin Clark-Casey (justincc) | 2011-02-11 23:06:14 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-02-11 23:06:14 +0000 |
commit | 754c244f468a038be2417ed611e5bf3fb962a987 (patch) | |
tree | a275056f1c492b5a86e8b60402dae8b213833c59 | |
parent | minor: Add some more information to the mesh_sculpted_prim [PHYSICS] setting (diff) | |
download | opensim-SC-754c244f468a038be2417ed611e5bf3fb962a987.zip opensim-SC-754c244f468a038be2417ed611e5bf3fb962a987.tar.gz opensim-SC-754c244f468a038be2417ed611e5bf3fb962a987.tar.bz2 opensim-SC-754c244f468a038be2417ed611e5bf3fb962a987.tar.xz |
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
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 6 | ||||
-rwxr-xr-x | bin/sqlite3.dll | bin | 505771 -> 559244 bytes |
2 files changed, 0 insertions, 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 | |||
669 | } | 669 | } |
670 | } | 670 | } |
671 | 671 | ||
672 | /// <summary> | ||
673 | /// | ||
674 | /// </summary> | ||
675 | /// <param name="globalID"></param> | ||
676 | public void RemoveLandObject(UUID globalID) | 672 | public void RemoveLandObject(UUID globalID) |
677 | { | 673 | { |
678 | lock (ds) | 674 | lock (ds) |
@@ -698,7 +694,6 @@ namespace OpenSim.Data.SQLite | |||
698 | if (landRow != null) | 694 | if (landRow != null) |
699 | { | 695 | { |
700 | landRow.Delete(); | 696 | landRow.Delete(); |
701 | land.Rows.Remove(landRow); | ||
702 | } | 697 | } |
703 | List<DataRow> rowsToDelete = new List<DataRow>(); | 698 | List<DataRow> rowsToDelete = new List<DataRow>(); |
704 | foreach (DataRow rowToCheck in landaccesslist.Rows) | 699 | foreach (DataRow rowToCheck in landaccesslist.Rows) |
@@ -709,7 +704,6 @@ namespace OpenSim.Data.SQLite | |||
709 | for (int iter = 0; iter < rowsToDelete.Count; iter++) | 704 | for (int iter = 0; iter < rowsToDelete.Count; iter++) |
710 | { | 705 | { |
711 | rowsToDelete[iter].Delete(); | 706 | rowsToDelete[iter].Delete(); |
712 | landaccesslist.Rows.Remove(rowsToDelete[iter]); | ||
713 | } | 707 | } |
714 | } | 708 | } |
715 | Commit(); | 709 | Commit(); |
diff --git a/bin/sqlite3.dll b/bin/sqlite3.dll index 558a015..f29dc62 100755 --- a/bin/sqlite3.dll +++ b/bin/sqlite3.dll | |||
Binary files differ | |||