diff options
Diffstat (limited to 'OpenSim/Data/SQLite')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index d22a3ec..1d17bb9 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs | |||
@@ -336,7 +336,7 @@ namespace OpenSim.Data.SQLite | |||
336 | /// <param name="regionUUID">the region UUID</param> | 336 | /// <param name="regionUUID">the region UUID</param> |
337 | public void RemoveObject(UUID obj, UUID regionUUID) | 337 | public void RemoveObject(UUID obj, UUID regionUUID) |
338 | { | 338 | { |
339 | m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.Guid, regionUUID); | 339 | // m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.Guid, regionUUID); |
340 | 340 | ||
341 | DataTable prims = ds.Tables["prims"]; | 341 | DataTable prims = ds.Tables["prims"]; |
342 | DataTable shapes = ds.Tables["primshapes"]; | 342 | DataTable shapes = ds.Tables["primshapes"]; |
@@ -638,29 +638,29 @@ namespace OpenSim.Data.SQLite | |||
638 | DataTable land = ds.Tables["land"]; | 638 | DataTable land = ds.Tables["land"]; |
639 | DataTable landaccesslist = ds.Tables["landaccesslist"]; | 639 | DataTable landaccesslist = ds.Tables["landaccesslist"]; |
640 | 640 | ||
641 | DataRow landRow = land.Rows.Find(parcel.landData.GlobalID.ToString()); | 641 | DataRow landRow = land.Rows.Find(parcel.LandData.GlobalID.ToString()); |
642 | if (landRow == null) | 642 | if (landRow == null) |
643 | { | 643 | { |
644 | landRow = land.NewRow(); | 644 | landRow = land.NewRow(); |
645 | fillLandRow(landRow, parcel.landData, parcel.regionUUID); | 645 | fillLandRow(landRow, parcel.LandData, parcel.RegionUUID); |
646 | land.Rows.Add(landRow); | 646 | land.Rows.Add(landRow); |
647 | } | 647 | } |
648 | else | 648 | else |
649 | { | 649 | { |
650 | fillLandRow(landRow, parcel.landData, parcel.regionUUID); | 650 | fillLandRow(landRow, parcel.LandData, parcel.RegionUUID); |
651 | } | 651 | } |
652 | 652 | ||
653 | // I know this caused someone issues before, but OpenSim is unusable if we leave this stuff around | 653 | // I know this caused someone issues before, but OpenSim is unusable if we leave this stuff around |
654 | using (SqliteCommand cmd = new SqliteCommand("delete from landaccesslist where LandUUID=:LandUUID", m_conn)) | 654 | using (SqliteCommand cmd = new SqliteCommand("delete from landaccesslist where LandUUID=:LandUUID", m_conn)) |
655 | { | 655 | { |
656 | cmd.Parameters.Add(new SqliteParameter(":LandUUID", parcel.landData.GlobalID.ToString())); | 656 | cmd.Parameters.Add(new SqliteParameter(":LandUUID", parcel.LandData.GlobalID.ToString())); |
657 | cmd.ExecuteNonQuery(); | 657 | cmd.ExecuteNonQuery(); |
658 | } | 658 | } |
659 | 659 | ||
660 | foreach (ParcelManager.ParcelAccessEntry entry in parcel.landData.ParcelAccessList) | 660 | foreach (ParcelManager.ParcelAccessEntry entry in parcel.LandData.ParcelAccessList) |
661 | { | 661 | { |
662 | DataRow newAccessRow = landaccesslist.NewRow(); | 662 | DataRow newAccessRow = landaccesslist.NewRow(); |
663 | fillLandAccessRow(newAccessRow, entry, parcel.landData.GlobalID); | 663 | fillLandAccessRow(newAccessRow, entry, parcel.LandData.GlobalID); |
664 | landaccesslist.Rows.Add(newAccessRow); | 664 | landaccesslist.Rows.Add(newAccessRow); |
665 | } | 665 | } |
666 | } | 666 | } |