aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite/SQLiteRegionData.cs
diff options
context:
space:
mode:
authordr scofield (aka dirk husemann)2009-10-02 11:10:52 +0200
committerdr scofield (aka dirk husemann)2009-10-02 11:31:30 +0200
commit2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7 (patch)
tree74913862b829b7e56994f2c33ca5fe35638baad1 /OpenSim/Data/SQLite/SQLiteRegionData.cs
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7.zip
opensim-SC_OLD-2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7.tar.gz
opensim-SC_OLD-2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7.tar.bz2
opensim-SC_OLD-2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7.tar.xz
- cleaning up LandData/ILandObject capitalization issues
- adding LandDataSerializer to OAR mechanics
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteRegionData.cs')
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs12
1 files changed, 6 insertions, 6 deletions
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 }