diff options
author | Melanie | 2011-02-11 23:53:52 +0100 |
---|---|---|
committer | Melanie | 2011-02-11 23:53:52 +0100 |
commit | 413f0c684801d5849d867432321228e26e4488dd (patch) | |
tree | 2208226265a562b28eaba861d5591d5c6efb4c6a /OpenSim/Data | |
parent | Temp fix (or is it a fox?) for map weirdness (diff) | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-413f0c684801d5849d867432321228e26e4488dd.zip opensim-SC-413f0c684801d5849d867432321228e26e4488dd.tar.gz opensim-SC-413f0c684801d5849d867432321228e26e4488dd.tar.bz2 opensim-SC-413f0c684801d5849d867432321228e26e4488dd.tar.xz |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Data')
-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(); |