diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLRegionData.cs | 8 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | 6 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs index e26a830..6318c09 100644 --- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs +++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs | |||
@@ -624,7 +624,7 @@ ELSE | |||
624 | //As the delete landaccess is already in the mysql code | 624 | //As the delete landaccess is already in the mysql code |
625 | 625 | ||
626 | //Delete old values | 626 | //Delete old values |
627 | RemoveLandObject(parcel.landData.GlobalID); | 627 | RemoveLandObject(parcel.LandData.GlobalID); |
628 | 628 | ||
629 | //Insert new values | 629 | //Insert new values |
630 | string sql = @"INSERT INTO [land] | 630 | string sql = @"INSERT INTO [land] |
@@ -634,7 +634,7 @@ VALUES | |||
634 | 634 | ||
635 | using (AutoClosingSqlCommand cmd = _Database.Query(sql)) | 635 | using (AutoClosingSqlCommand cmd = _Database.Query(sql)) |
636 | { | 636 | { |
637 | cmd.Parameters.AddRange(CreateLandParameters(parcel.landData, parcel.regionUUID)); | 637 | cmd.Parameters.AddRange(CreateLandParameters(parcel.LandData, parcel.RegionUUID)); |
638 | 638 | ||
639 | cmd.ExecuteNonQuery(); | 639 | cmd.ExecuteNonQuery(); |
640 | } | 640 | } |
@@ -643,9 +643,9 @@ VALUES | |||
643 | 643 | ||
644 | using (AutoClosingSqlCommand cmd = _Database.Query(sql)) | 644 | using (AutoClosingSqlCommand cmd = _Database.Query(sql)) |
645 | { | 645 | { |
646 | foreach (ParcelManager.ParcelAccessEntry parcelAccessEntry in parcel.landData.ParcelAccessList) | 646 | foreach (ParcelManager.ParcelAccessEntry parcelAccessEntry in parcel.LandData.ParcelAccessList) |
647 | { | 647 | { |
648 | cmd.Parameters.AddRange(CreateLandAccessParameters(parcelAccessEntry, parcel.regionUUID)); | 648 | cmd.Parameters.AddRange(CreateLandAccessParameters(parcelAccessEntry, parcel.RegionUUID)); |
649 | 649 | ||
650 | cmd.ExecuteNonQuery(); | 650 | cmd.ExecuteNonQuery(); |
651 | cmd.Parameters.Clear(); | 651 | cmd.Parameters.Clear(); |
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs index c2dd788..f25bfd7 100644 --- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | |||
@@ -685,7 +685,7 @@ namespace OpenSim.Data.MySQL | |||
685 | "?UserLookAtX, ?UserLookAtY, ?UserLookAtZ, " + | 685 | "?UserLookAtX, ?UserLookAtY, ?UserLookAtZ, " + |
686 | "?AuthbuyerID, ?OtherCleanTime, ?Dwell)"; | 686 | "?AuthbuyerID, ?OtherCleanTime, ?Dwell)"; |
687 | 687 | ||
688 | FillLandCommand(cmd, parcel.landData, parcel.regionUUID); | 688 | FillLandCommand(cmd, parcel.LandData, parcel.RegionUUID); |
689 | 689 | ||
690 | ExecuteNonQuery(cmd); | 690 | ExecuteNonQuery(cmd); |
691 | 691 | ||
@@ -700,9 +700,9 @@ namespace OpenSim.Data.MySQL | |||
700 | "?Flags)"; | 700 | "?Flags)"; |
701 | 701 | ||
702 | foreach (ParcelManager.ParcelAccessEntry entry in | 702 | foreach (ParcelManager.ParcelAccessEntry entry in |
703 | parcel.landData.ParcelAccessList) | 703 | parcel.LandData.ParcelAccessList) |
704 | { | 704 | { |
705 | FillLandAccessCommand(cmd, entry, parcel.landData.GlobalID); | 705 | FillLandAccessCommand(cmd, entry, parcel.LandData.GlobalID); |
706 | ExecuteNonQuery(cmd); | 706 | ExecuteNonQuery(cmd); |
707 | cmd.Parameters.Clear(); | 707 | cmd.Parameters.Clear(); |
708 | } | 708 | } |
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index d22a3ec..b246a4a 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs | |||
@@ -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 | } |