diff options
author | Melanie | 2009-10-05 16:31:54 +0100 |
---|---|---|
committer | Melanie | 2009-10-05 16:31:54 +0100 |
commit | 5702c8f910f7e745aaa1bbab2e40b26b361071ad (patch) | |
tree | 5a6f6475505458051e182ea1b7f673e415f370a8 /OpenSim/Data/MSSQL | |
parent | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-5702c8f910f7e745aaa1bbab2e40b26b361071ad.zip opensim-SC-5702c8f910f7e745aaa1bbab2e40b26b361071ad.tar.gz opensim-SC-5702c8f910f7e745aaa1bbab2e40b26b361071ad.tar.bz2 opensim-SC-5702c8f910f7e745aaa1bbab2e40b26b361071ad.tar.xz |
Adapt to renamed members in landObject
Diffstat (limited to 'OpenSim/Data/MSSQL')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs index adedcce..e2ae5cb 100644 --- a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs +++ b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs | |||
@@ -575,7 +575,7 @@ ELSE | |||
575 | /// <returns></returns> | 575 | /// <returns></returns> |
576 | public List<LandData> LoadLandObjects(UUID regionUUID) | 576 | public List<LandData> LoadLandObjects(UUID regionUUID) |
577 | { | 577 | { |
578 | List<LandData> landDataForRegion = new List<LandData>(); | 578 | List<LandData> LandDataForRegion = new List<LandData>(); |
579 | 579 | ||
580 | string sql = "select * from land where RegionUUID = @RegionUUID"; | 580 | string sql = "select * from land where RegionUUID = @RegionUUID"; |
581 | 581 | ||
@@ -588,30 +588,30 @@ ELSE | |||
588 | { | 588 | { |
589 | while (readerLandData.Read()) | 589 | while (readerLandData.Read()) |
590 | { | 590 | { |
591 | landDataForRegion.Add(BuildLandData(readerLandData)); | 591 | LandDataForRegion.Add(BuildLandData(readerLandData)); |
592 | } | 592 | } |
593 | } | 593 | } |
594 | } | 594 | } |
595 | 595 | ||
596 | //Retrieve all accesslist data for all landdata | 596 | //Retrieve all accesslist data for all landdata |
597 | foreach (LandData landData in landDataForRegion) | 597 | foreach (LandData LandData in LandDataForRegion) |
598 | { | 598 | { |
599 | sql = "select * from landaccesslist where LandUUID = @LandUUID"; | 599 | sql = "select * from landaccesslist where LandUUID = @LandUUID"; |
600 | using (AutoClosingSqlCommand cmdAccessList = _Database.Query(sql)) | 600 | using (AutoClosingSqlCommand cmdAccessList = _Database.Query(sql)) |
601 | { | 601 | { |
602 | cmdAccessList.Parameters.Add(_Database.CreateParameter("@LandUUID", landData.GlobalID)); | 602 | cmdAccessList.Parameters.Add(_Database.CreateParameter("@LandUUID", LandData.GlobalID)); |
603 | using (SqlDataReader readerAccessList = cmdAccessList.ExecuteReader()) | 603 | using (SqlDataReader readerAccessList = cmdAccessList.ExecuteReader()) |
604 | { | 604 | { |
605 | while (readerAccessList.Read()) | 605 | while (readerAccessList.Read()) |
606 | { | 606 | { |
607 | landData.ParcelAccessList.Add(BuildLandAccessData(readerAccessList)); | 607 | LandData.ParcelAccessList.Add(BuildLandAccessData(readerAccessList)); |
608 | } | 608 | } |
609 | } | 609 | } |
610 | } | 610 | } |
611 | } | 611 | } |
612 | 612 | ||
613 | //Return data | 613 | //Return data |
614 | return landDataForRegion; | 614 | return LandDataForRegion; |
615 | } | 615 | } |
616 | 616 | ||
617 | /// <summary> | 617 | /// <summary> |
@@ -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(); |