aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/SQLite/SQLiteSimulationData.cs3
-rw-r--r--OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs3
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs2
3 files changed, 7 insertions, 1 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();
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();
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
index 358d0a7..2d7244e 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
@@ -130,7 +130,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
130 130
131 List<string> mainParams = ops.Parse(cmdparams); 131 List<string> mainParams = ops.Parse(cmdparams);
132 132
133 if (cmdparams.Length > 2) 133 if (mainParams.Count > 2)
134 { 134 {
135 ArchiveRegion(mainParams[2], options); 135 ArchiveRegion(mainParams[2], options);
136 } 136 }