aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/Data.MySQL/MySQLDataStore.cs')
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLDataStore.cs19
1 files changed, 19 insertions, 0 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
index 5a9aba9..7929c0d 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
@@ -418,38 +418,57 @@ namespace OpenSim.Framework.Data.MySQL
418 { 418 {
419 lock (m_dataSet) 419 lock (m_dataSet)
420 { 420 {
421 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 1");
421 DataTable land = m_landTable; 422 DataTable land = m_landTable;
423 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 2");
422 DataTable landaccesslist = m_landAccessListTable; 424 DataTable landaccesslist = m_landAccessListTable;
423 425
426 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 3");
424 DataRow landRow = land.Rows.Find(Util.ToRawUuidString(parcel.landData.globalID)); 427 DataRow landRow = land.Rows.Find(Util.ToRawUuidString(parcel.landData.globalID));
428 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 4");
425 if (landRow == null) 429 if (landRow == null)
426 { 430 {
431 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 5");
427 landRow = land.NewRow(); 432 landRow = land.NewRow();
433 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 6");
428 fillLandRow(landRow, parcel.landData, regionUUID); 434 fillLandRow(landRow, parcel.landData, regionUUID);
435 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 7");
429 land.Rows.Add(landRow); 436 land.Rows.Add(landRow);
430 } 437 }
431 else 438 else
432 { 439 {
440 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 8");
433 fillLandRow(landRow, parcel.landData, regionUUID); 441 fillLandRow(landRow, parcel.landData, regionUUID);
434 } 442 }
435 443
444 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 9");
436 using ( 445 using (
437 MySqlCommand cmd = 446 MySqlCommand cmd =
438 new MySqlCommand("delete from landaccesslist where LandUUID=?LandUUID", m_connection)) 447 new MySqlCommand("delete from landaccesslist where LandUUID=?LandUUID", m_connection))
439 { 448 {
449 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 10");
440 cmd.Parameters.Add(new MySqlParameter("?LandUUID", Util.ToRawUuidString(parcel.landData.globalID))); 450 cmd.Parameters.Add(new MySqlParameter("?LandUUID", Util.ToRawUuidString(parcel.landData.globalID)));
451 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 11");
441 cmd.ExecuteNonQuery(); 452 cmd.ExecuteNonQuery();
442 } 453 }
443 454
455 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 12");
456 int i = 0;
444 foreach (ParcelManager.ParcelAccessEntry entry in parcel.landData.parcelAccessList) 457 foreach (ParcelManager.ParcelAccessEntry entry in parcel.landData.parcelAccessList)
445 { 458 {
459 i++;
460 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 12:1:" + i);
446 DataRow newAccessRow = landaccesslist.NewRow(); 461 DataRow newAccessRow = landaccesslist.NewRow();
462 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 12:2:" + i);
447 fillLandAccessRow(newAccessRow, entry, parcel.landData.globalID); 463 fillLandAccessRow(newAccessRow, entry, parcel.landData.globalID);
464 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 12:3:" + i);
448 landaccesslist.Rows.Add(newAccessRow); 465 landaccesslist.Rows.Add(newAccessRow);
449 } 466 }
450 } 467 }
451 468
469 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 13");
452 Commit(); 470 Commit();
471 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 14");
453 } 472 }
454 473
455 public List<LandData> LoadLandObjects(LLUUID regionUUID) 474 public List<LandData> LoadLandObjects(LLUUID regionUUID)