diff options
author | BlueWall | 2011-02-12 20:42:11 -0500 |
---|---|---|
committer | BlueWall | 2011-02-12 20:42:11 -0500 |
commit | c0e1742d479d4390701688da685892555f28bfbc (patch) | |
tree | 39d717dd9ce4c453898eca2237f9fc2d2879c1d4 /OpenSim/Data | |
parent | Merge branch 'master' of /home/opensim/src/OpenSim/Core (diff) | |
parent | Fixed a couple of tests in the HttpServer. Not sure if this is enough. Mantis... (diff) | |
download | opensim-SC_OLD-c0e1742d479d4390701688da685892555f28bfbc.zip opensim-SC_OLD-c0e1742d479d4390701688da685892555f28bfbc.tar.gz opensim-SC_OLD-c0e1742d479d4390701688da685892555f28bfbc.tar.bz2 opensim-SC_OLD-c0e1742d479d4390701688da685892555f28bfbc.tar.xz |
Merge branch 'master' of /home/opensim/src/OpenSim/Core
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index 8d93354..377c680 100644 --- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs | |||
@@ -669,10 +669,6 @@ namespace OpenSim.Data.SQLite | |||
669 | } | 669 | } |
670 | } | 670 | } |
671 | 671 | ||
672 | /// <summary> | ||
673 | /// | ||
674 | /// </summary> | ||
675 | /// <param name="globalID"></param> | ||
676 | public void RemoveLandObject(UUID globalID) | 672 | public void RemoveLandObject(UUID globalID) |
677 | { | 673 | { |
678 | lock (ds) | 674 | lock (ds) |
@@ -698,7 +694,6 @@ namespace OpenSim.Data.SQLite | |||
698 | if (landRow != null) | 694 | if (landRow != null) |
699 | { | 695 | { |
700 | landRow.Delete(); | 696 | landRow.Delete(); |
701 | land.Rows.Remove(landRow); | ||
702 | } | 697 | } |
703 | List<DataRow> rowsToDelete = new List<DataRow>(); | 698 | List<DataRow> rowsToDelete = new List<DataRow>(); |
704 | foreach (DataRow rowToCheck in landaccesslist.Rows) | 699 | foreach (DataRow rowToCheck in landaccesslist.Rows) |
@@ -709,7 +704,6 @@ namespace OpenSim.Data.SQLite | |||
709 | for (int iter = 0; iter < rowsToDelete.Count; iter++) | 704 | for (int iter = 0; iter < rowsToDelete.Count; iter++) |
710 | { | 705 | { |
711 | rowsToDelete[iter].Delete(); | 706 | rowsToDelete[iter].Delete(); |
712 | landaccesslist.Rows.Remove(rowsToDelete[iter]); | ||
713 | } | 707 | } |
714 | } | 708 | } |
715 | Commit(); | 709 | Commit(); |