From 5702c8f910f7e745aaa1bbab2e40b26b361071ad Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 5 Oct 2009 16:31:54 +0100
Subject: Adapt to renamed members in landObject
---
OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
(limited to 'OpenSim/Data/MSSQL')
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
///
public List LoadLandObjects(UUID regionUUID)
{
- List landDataForRegion = new List();
+ List LandDataForRegion = new List();
string sql = "select * from land where RegionUUID = @RegionUUID";
@@ -588,30 +588,30 @@ ELSE
{
while (readerLandData.Read())
{
- landDataForRegion.Add(BuildLandData(readerLandData));
+ LandDataForRegion.Add(BuildLandData(readerLandData));
}
}
}
//Retrieve all accesslist data for all landdata
- foreach (LandData landData in landDataForRegion)
+ foreach (LandData LandData in LandDataForRegion)
{
sql = "select * from landaccesslist where LandUUID = @LandUUID";
using (AutoClosingSqlCommand cmdAccessList = _Database.Query(sql))
{
- cmdAccessList.Parameters.Add(_Database.CreateParameter("@LandUUID", landData.GlobalID));
+ cmdAccessList.Parameters.Add(_Database.CreateParameter("@LandUUID", LandData.GlobalID));
using (SqlDataReader readerAccessList = cmdAccessList.ExecuteReader())
{
while (readerAccessList.Read())
{
- landData.ParcelAccessList.Add(BuildLandAccessData(readerAccessList));
+ LandData.ParcelAccessList.Add(BuildLandAccessData(readerAccessList));
}
}
}
}
//Return data
- return landDataForRegion;
+ return LandDataForRegion;
}
///
@@ -624,7 +624,7 @@ ELSE
//As the delete landaccess is already in the mysql code
//Delete old values
- RemoveLandObject(parcel.landData.GlobalID);
+ RemoveLandObject(parcel.LandData.GlobalID);
//Insert new values
string sql = @"INSERT INTO [land]
@@ -634,7 +634,7 @@ VALUES
using (AutoClosingSqlCommand cmd = _Database.Query(sql))
{
- cmd.Parameters.AddRange(CreateLandParameters(parcel.landData, parcel.regionUUID));
+ cmd.Parameters.AddRange(CreateLandParameters(parcel.LandData, parcel.RegionUUID));
cmd.ExecuteNonQuery();
}
@@ -643,9 +643,9 @@ VALUES
using (AutoClosingSqlCommand cmd = _Database.Query(sql))
{
- foreach (ParcelManager.ParcelAccessEntry parcelAccessEntry in parcel.landData.ParcelAccessList)
+ foreach (ParcelManager.ParcelAccessEntry parcelAccessEntry in parcel.LandData.ParcelAccessList)
{
- cmd.Parameters.AddRange(CreateLandAccessParameters(parcelAccessEntry, parcel.regionUUID));
+ cmd.Parameters.AddRange(CreateLandAccessParameters(parcelAccessEntry, parcel.RegionUUID));
cmd.ExecuteNonQuery();
cmd.Parameters.Clear();
--
cgit v1.1