aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite/SQLiteSimulationData.cs
diff options
context:
space:
mode:
authorMelanie2010-11-23 14:03:52 +0000
committerMelanie2010-11-23 14:03:52 +0000
commit2527aeb40c5752016524e10797a6d09b4e6816af (patch)
treee425b306aa311c639115904df9a68241078b1689 /OpenSim/Data/SQLite/SQLiteSimulationData.cs
parentFix more potential nullrefs (diff)
parentInitialize InventoryItemBase.creatorData properly. Could throw. (diff)
downloadopensim-SC_OLD-2527aeb40c5752016524e10797a6d09b4e6816af.zip
opensim-SC_OLD-2527aeb40c5752016524e10797a6d09b4e6816af.tar.gz
opensim-SC_OLD-2527aeb40c5752016524e10797a6d09b4e6816af.tar.bz2
opensim-SC_OLD-2527aeb40c5752016524e10797a6d09b4e6816af.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteSimulationData.cs')
-rw-r--r--OpenSim/Data/SQLite/SQLiteSimulationData.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index 0bfd73a..8d93354 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -697,6 +697,7 @@ namespace OpenSim.Data.SQLite
697 DataRow landRow = land.Rows.Find(globalID.ToString()); 697 DataRow landRow = land.Rows.Find(globalID.ToString());
698 if (landRow != null) 698 if (landRow != null)
699 { 699 {
700 landRow.Delete();
700 land.Rows.Remove(landRow); 701 land.Rows.Remove(landRow);
701 } 702 }
702 List<DataRow> rowsToDelete = new List<DataRow>(); 703 List<DataRow> rowsToDelete = new List<DataRow>();
@@ -707,6 +708,7 @@ namespace OpenSim.Data.SQLite
707 } 708 }
708 for (int iter = 0; iter < rowsToDelete.Count; iter++) 709 for (int iter = 0; iter < rowsToDelete.Count; iter++)
709 { 710 {
711 rowsToDelete[iter].Delete();
710 landaccesslist.Rows.Remove(rowsToDelete[iter]); 712 landaccesslist.Rows.Remove(rowsToDelete[iter]);
711 } 713 }
712 } 714 }
@@ -755,6 +757,7 @@ namespace OpenSim.Data.SQLite
755 } 757 }
756 for (int iter = 0; iter < rowsToDelete.Count; iter++) 758 for (int iter = 0; iter < rowsToDelete.Count; iter++)
757 { 759 {
760 rowsToDelete[iter].Delete();
758 landaccesslist.Rows.Remove(rowsToDelete[iter]); 761 landaccesslist.Rows.Remove(rowsToDelete[iter]);
759 } 762 }
760 rowsToDelete.Clear(); 763 rowsToDelete.Clear();