aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLiteLegacy/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/SQLiteLegacy/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/SQLiteLegacy/SQLiteSimulationData.cs')
-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();