From 30b7c047fab84df0b8d6ea6b4da10a33429046b7 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Tue, 18 Dec 2007 18:32:20 +0000
Subject: *Removed Unneeded Debug I added in my last revison *Fixed typo
 causing access lists not to be stored correctly in sqlite

---
 OpenSim/Region/Environment/LandManagement/LandManager.cs            | 1 +
 .../Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs     | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/Environment/LandManagement/LandManager.cs b/OpenSim/Region/Environment/LandManagement/LandManager.cs
index 7904f12..f3ab502 100644
--- a/OpenSim/Region/Environment/LandManagement/LandManager.cs
+++ b/OpenSim/Region/Environment/LandManagement/LandManager.cs
@@ -104,6 +104,7 @@ namespace OpenSim.Region.Environment.LandManagement
         }
 
         #endregion
+
         #region Member Variables
 
         public Dictionary<int, Land> landList = new Dictionary<int, Land>();
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
index cc9146d..6112720 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
@@ -388,7 +388,6 @@ namespace OpenSim.DataStore.MonoSqlite
                 SqliteConnection conn = new SqliteConnection(m_connectionString);
                 conn.Open();
 
-                Console.WriteLine("REMOVING LAND WITH ID " + globalID);
                 using (SqliteCommand cmd = new SqliteCommand("delete from land where UUID=:UUID", conn))
                 {
                     cmd.Parameters.Add(new SqliteParameter(":UUID", globalID.ToString()));
@@ -410,8 +409,6 @@ namespace OpenSim.DataStore.MonoSqlite
             {
                 SqliteConnection conn = new SqliteConnection(m_connectionString);
                 conn.Open();
-
-                Console.WriteLine("STORING LAND TO SQLITE: " + parcel.landData.landName + " (" + parcel.landData.globalID + ")");
                 DataTable land = ds.Tables["land"];
                 DataTable landaccesslist = ds.Tables["landaccesslist"];
 
@@ -458,7 +455,6 @@ namespace OpenSim.DataStore.MonoSqlite
                 foreach (DataRow rawDataLand in rawDataForRegion)
                 {
                     LandData newLand = buildLandData(rawDataLand);
-                    Console.WriteLine("LOADED NEW LAND FROM SQLITE: " + newLand.landName + " (" + newLand.globalID + ")");
                     string accessListSearchExp = "LandUUID = '" + newLand.globalID.ToString() + "'";
                     DataRow[] rawDataForLandAccessList = landaccesslist.Select(accessListSearchExp);
                     foreach (DataRow rawDataLandAccess in rawDataForLandAccessList)
@@ -778,7 +774,7 @@ namespace OpenSim.DataStore.MonoSqlite
         private ParcelManager.ParcelAccessEntry buildLandAccessData(DataRow row)
         {
             ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
-            entry.AgentID = new LLUUID((string)row["LandUUID"]);
+            entry.AgentID = new LLUUID((string)row["AccessUUID"]);
             entry.Flags = (ParcelManager.AccessList)row["Flags"];
             entry.Time = new DateTime();
             return entry;
-- 
cgit v1.1