aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLiteLegacy
diff options
context:
space:
mode:
authorMarck2010-11-23 10:40:31 +0100
committerMarck2010-11-23 11:45:12 +0100
commitba2bf78dcfe57a9e5f3d00a572f7cc82975a4fc0 (patch)
treed34e24d1efc909f2ae52377e583e1022072457a0 /OpenSim/Data/SQLiteLegacy
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-ba2bf78dcfe57a9e5f3d00a572f7cc82975a4fc0.zip
opensim-SC_OLD-ba2bf78dcfe57a9e5f3d00a572f7cc82975a4fc0.tar.gz
opensim-SC_OLD-ba2bf78dcfe57a9e5f3d00a572f7cc82975a4fc0.tar.bz2
opensim-SC_OLD-ba2bf78dcfe57a9e5f3d00a572f7cc82975a4fc0.tar.xz
Fix joining land parcels not being stored correctly in SQLite. Thank you to goetz for the initial patch in Mantis #5230.
Diffstat (limited to 'OpenSim/Data/SQLiteLegacy')
-rw-r--r--OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs b/OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs
index 1ad1e66..644864a 100644
--- a/OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs
@@ -657,6 +657,7 @@ namespace OpenSim.Data.SQLiteLegacy
657 DataRow landRow = land.Rows.Find(globalID.ToString()); 657 DataRow landRow = land.Rows.Find(globalID.ToString());
658 if (landRow != null) 658 if (landRow != null)
659 { 659 {
660 landRow.Delete();
660 land.Rows.Remove(landRow); 661 land.Rows.Remove(landRow);
661 } 662 }
662 List<DataRow> rowsToDelete = new List<DataRow>(); 663 List<DataRow> rowsToDelete = new List<DataRow>();
@@ -667,6 +668,7 @@ namespace OpenSim.Data.SQLiteLegacy
667 } 668 }
668 for (int iter = 0; iter < rowsToDelete.Count; iter++) 669 for (int iter = 0; iter < rowsToDelete.Count; iter++)
669 { 670 {
671 rowsToDelete[iter].Delete();
670 landaccesslist.Rows.Remove(rowsToDelete[iter]); 672 landaccesslist.Rows.Remove(rowsToDelete[iter]);
671 } 673 }
672 674
@@ -717,6 +719,7 @@ namespace OpenSim.Data.SQLiteLegacy
717 } 719 }
718 for (int iter = 0; iter < rowsToDelete.Count; iter++) 720 for (int iter = 0; iter < rowsToDelete.Count; iter++)
719 { 721 {
722 rowsToDelete[iter].Delete();
720 landaccesslist.Rows.Remove(rowsToDelete[iter]); 723 landaccesslist.Rows.Remove(rowsToDelete[iter]);
721 } 724 }
722 rowsToDelete.Clear(); 725 rowsToDelete.Clear();