Merge branch 'master' into diva-textures

4 files changed, 15 insertions, 15 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
             //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();
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
                         "?UserLookAtX, ?UserLookAtY, ?UserLookAtZ, " +
                         "?AuthbuyerID, ?OtherCleanTime, ?Dwell)";
 
-                FillLandCommand(cmd, parcel.landData, parcel.regionUUID);
+                FillLandCommand(cmd, parcel.LandData, parcel.RegionUUID);
 
                 ExecuteNonQuery(cmd);
 
@@ -700,9 +700,9 @@ namespace OpenSim.Data.MySQL
                         "?Flags)";
 
                 foreach (ParcelManager.ParcelAccessEntry entry in
-                        parcel.landData.ParcelAccessList)
+                        parcel.LandData.ParcelAccessList)
                 {
-                    FillLandAccessCommand(cmd, entry, parcel.landData.GlobalID);
+                    FillLandAccessCommand(cmd, entry, parcel.LandData.GlobalID);
                     ExecuteNonQuery(cmd);
                     cmd.Parameters.Clear();
                 }
diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
index 673ca6f..f19fda1 100644
--- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
@@ -227,7 +227,7 @@ namespace OpenSim.Data.NHibernate
                 manager.Delete(p);
             }
 
-            m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.Guid, regionUUID);
+            // m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.Guid, regionUUID);
 
         }
 
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
         /// <param name="regionUUID">the region UUID</param>
         public void RemoveObject(UUID obj, UUID regionUUID)
         {
-            m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.Guid, regionUUID);
+            // m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.Guid, regionUUID);
 
             DataTable prims = ds.Tables["prims"];
             DataTable shapes = ds.Tables["primshapes"];
@@ -638,29 +638,29 @@ namespace OpenSim.Data.SQLite
                 DataTable land = ds.Tables["land"];
                 DataTable landaccesslist = ds.Tables["landaccesslist"];
 
-                DataRow landRow = land.Rows.Find(parcel.landData.GlobalID.ToString());
+                DataRow landRow = land.Rows.Find(parcel.LandData.GlobalID.ToString());
                 if (landRow == null)
                 {
                     landRow = land.NewRow();
-                    fillLandRow(landRow, parcel.landData, parcel.regionUUID);
+                    fillLandRow(landRow, parcel.LandData, parcel.RegionUUID);
                     land.Rows.Add(landRow);
                 }
                 else
                 {
-                    fillLandRow(landRow, parcel.landData, parcel.regionUUID);
+                    fillLandRow(landRow, parcel.LandData, parcel.RegionUUID);
                 }
 
                 // I know this caused someone issues before, but OpenSim is unusable if we leave this stuff around
                 using (SqliteCommand cmd = new SqliteCommand("delete from landaccesslist where LandUUID=:LandUUID", m_conn))
                 {
-                    cmd.Parameters.Add(new SqliteParameter(":LandUUID", parcel.landData.GlobalID.ToString()));
+                    cmd.Parameters.Add(new SqliteParameter(":LandUUID", parcel.LandData.GlobalID.ToString()));
                     cmd.ExecuteNonQuery();
                 }
 
-                foreach (ParcelManager.ParcelAccessEntry entry in parcel.landData.ParcelAccessList)
+                foreach (ParcelManager.ParcelAccessEntry entry in parcel.LandData.ParcelAccessList)
                 {
                     DataRow newAccessRow = landaccesslist.NewRow();
-                    fillLandAccessRow(newAccessRow, entry, parcel.landData.GlobalID);
+                    fillLandAccessRow(newAccessRow, entry, parcel.LandData.GlobalID);
                     landaccesslist.Rows.Add(newAccessRow);
                 }
             }