aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Storage
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Storage')
-rw-r--r--OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs6
1 files changed, 1 insertions, 5 deletions
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
388 SqliteConnection conn = new SqliteConnection(m_connectionString); 388 SqliteConnection conn = new SqliteConnection(m_connectionString);
389 conn.Open(); 389 conn.Open();
390 390
391 Console.WriteLine("REMOVING LAND WITH ID " + globalID);
392 using (SqliteCommand cmd = new SqliteCommand("delete from land where UUID=:UUID", conn)) 391 using (SqliteCommand cmd = new SqliteCommand("delete from land where UUID=:UUID", conn))
393 { 392 {
394 cmd.Parameters.Add(new SqliteParameter(":UUID", globalID.ToString())); 393 cmd.Parameters.Add(new SqliteParameter(":UUID", globalID.ToString()));
@@ -410,8 +409,6 @@ namespace OpenSim.DataStore.MonoSqlite
410 { 409 {
411 SqliteConnection conn = new SqliteConnection(m_connectionString); 410 SqliteConnection conn = new SqliteConnection(m_connectionString);
412 conn.Open(); 411 conn.Open();
413
414 Console.WriteLine("STORING LAND TO SQLITE: " + parcel.landData.landName + " (" + parcel.landData.globalID + ")");
415 DataTable land = ds.Tables["land"]; 412 DataTable land = ds.Tables["land"];
416 DataTable landaccesslist = ds.Tables["landaccesslist"]; 413 DataTable landaccesslist = ds.Tables["landaccesslist"];
417 414
@@ -458,7 +455,6 @@ namespace OpenSim.DataStore.MonoSqlite
458 foreach (DataRow rawDataLand in rawDataForRegion) 455 foreach (DataRow rawDataLand in rawDataForRegion)
459 { 456 {
460 LandData newLand = buildLandData(rawDataLand); 457 LandData newLand = buildLandData(rawDataLand);
461 Console.WriteLine("LOADED NEW LAND FROM SQLITE: " + newLand.landName + " (" + newLand.globalID + ")");
462 string accessListSearchExp = "LandUUID = '" + newLand.globalID.ToString() + "'"; 458 string accessListSearchExp = "LandUUID = '" + newLand.globalID.ToString() + "'";
463 DataRow[] rawDataForLandAccessList = landaccesslist.Select(accessListSearchExp); 459 DataRow[] rawDataForLandAccessList = landaccesslist.Select(accessListSearchExp);
464 foreach (DataRow rawDataLandAccess in rawDataForLandAccessList) 460 foreach (DataRow rawDataLandAccess in rawDataForLandAccessList)
@@ -778,7 +774,7 @@ namespace OpenSim.DataStore.MonoSqlite
778 private ParcelManager.ParcelAccessEntry buildLandAccessData(DataRow row) 774 private ParcelManager.ParcelAccessEntry buildLandAccessData(DataRow row)
779 { 775 {
780 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); 776 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
781 entry.AgentID = new LLUUID((string)row["LandUUID"]); 777 entry.AgentID = new LLUUID((string)row["AccessUUID"]);
782 entry.Flags = (ParcelManager.AccessList)row["Flags"]; 778 entry.Flags = (ParcelManager.AccessList)row["Flags"];
783 entry.Time = new DateTime(); 779 entry.Time = new DateTime();
784 return entry; 780 return entry;