diff options
author | Jonathan Freedman | 2010-11-23 22:27:54 -0800 |
---|---|---|
committer | Jonathan Freedman | 2010-11-23 22:27:54 -0800 |
commit | bc51dfc45eb73e34d91fd72d0a537ffc907a9da6 (patch) | |
tree | 084062cd82e16edbff08a5e3b705458d915caf86 /OpenSim/Data | |
parent | Merge branch 'master-core' into mantis5110 (diff) | |
parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
download | opensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.zip opensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.tar.gz opensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.tar.bz2 opensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.tar.xz |
Merge branch 'master-core' into mantis5110
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 3 | ||||
-rw-r--r-- | OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs | 3 | ||||
-rw-r--r-- | OpenSim/Data/Tests/InventoryTests.cs | 6 |
3 files changed, 10 insertions, 2 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/Data/Tests/InventoryTests.cs b/OpenSim/Data/Tests/InventoryTests.cs index 3205bfa..dc03259 100644 --- a/OpenSim/Data/Tests/InventoryTests.cs +++ b/OpenSim/Data/Tests/InventoryTests.cs | |||
@@ -323,7 +323,8 @@ namespace OpenSim.Data.Tests | |||
323 | .IgnoreProperty(x => x.InvType) | 323 | .IgnoreProperty(x => x.InvType) |
324 | .IgnoreProperty(x => x.CreatorIdAsUuid) | 324 | .IgnoreProperty(x => x.CreatorIdAsUuid) |
325 | .IgnoreProperty(x => x.Description) | 325 | .IgnoreProperty(x => x.Description) |
326 | .IgnoreProperty(x => x.CreatorId)); | 326 | .IgnoreProperty(x => x.CreatorId) |
327 | .IgnoreProperty(x => x.CreatorData)); | ||
327 | 328 | ||
328 | inventoryScrambler.Scramble(expected); | 329 | inventoryScrambler.Scramble(expected); |
329 | db.updateInventoryItem(expected); | 330 | db.updateInventoryItem(expected); |
@@ -333,7 +334,8 @@ namespace OpenSim.Data.Tests | |||
333 | .IgnoreProperty(x => x.InvType) | 334 | .IgnoreProperty(x => x.InvType) |
334 | .IgnoreProperty(x => x.CreatorIdAsUuid) | 335 | .IgnoreProperty(x => x.CreatorIdAsUuid) |
335 | .IgnoreProperty(x => x.Description) | 336 | .IgnoreProperty(x => x.Description) |
336 | .IgnoreProperty(x => x.CreatorId)); | 337 | .IgnoreProperty(x => x.CreatorId) |
338 | .IgnoreProperty(x => x.CreatorData)); | ||
337 | } | 339 | } |
338 | 340 | ||
339 | [Test] | 341 | [Test] |