diff options
author | Tedd Hansen | 2008-01-19 22:23:22 +0000 |
---|---|---|
committer | Tedd Hansen | 2008-01-19 22:23:22 +0000 |
commit | cc635a651a57ff30ab55d34c8ba9f448e3a64799 (patch) | |
tree | c69f54b39c1bf0faf61bbd5a899f878245e7ebd8 | |
parent | That didn't work -- added more debugging (diff) | |
download | opensim-SC-cc635a651a57ff30ab55d34c8ba9f448e3a64799.zip opensim-SC-cc635a651a57ff30ab55d34c8ba9f448e3a64799.tar.gz opensim-SC-cc635a651a57ff30ab55d34c8ba9f448e3a64799.tar.bz2 opensim-SC-cc635a651a57ff30ab55d34c8ba9f448e3a64799.tar.xz |
Most is back in its original state :) Hope I didn't break anything... *looks innocent*
-rw-r--r-- | OpenSim/Framework/Data.MySQL/MySQLDataStore.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/Environment/LandManagement/LandManager.cs | 15 |
2 files changed, 8 insertions, 14 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs index 0d2bd43..c76748d 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs | |||
@@ -519,25 +519,18 @@ namespace OpenSim.Framework.Data.MySQL | |||
519 | 519 | ||
520 | // DisplayDataSet(m_dataSet, "Region DataSet"); | 520 | // DisplayDataSet(m_dataSet, "Region DataSet"); |
521 | 521 | ||
522 | MainLog.Instance.Verbose("DATASTORE", "Tedd debug: m_primDataAdapter.Update(m_primTable)"); | ||
523 | m_primDataAdapter.Update(m_primTable); | 522 | m_primDataAdapter.Update(m_primTable); |
524 | MainLog.Instance.Verbose("DATASTORE", "Tedd debug: m_shapeDataAdapter.Update(m_shapeTable)"); | ||
525 | m_shapeDataAdapter.Update(m_shapeTable); | 523 | m_shapeDataAdapter.Update(m_shapeTable); |
526 | 524 | ||
527 | if (persistPrimInventories) | 525 | if (persistPrimInventories) |
528 | { | 526 | { |
529 | MainLog.Instance.Verbose("DATASTORE", "Tedd debug: m_itemsDataAdapter.Update(m_itemsTable)"); | ||
530 | m_itemsDataAdapter.Update(m_itemsTable); | 527 | m_itemsDataAdapter.Update(m_itemsTable); |
531 | } | 528 | } |
532 | 529 | ||
533 | MainLog.Instance.Verbose("DATASTORE", "Tedd debug: m_terrainDataAdapter.Update(m_terrainTable)"); | ||
534 | m_terrainDataAdapter.Update(m_terrainTable); | 530 | m_terrainDataAdapter.Update(m_terrainTable); |
535 | MainLog.Instance.Verbose("DATASTORE", "Tedd debug: m_landDataAdapter.Update(m_landTable)"); | ||
536 | m_landDataAdapter.Update(m_landTable); | 531 | m_landDataAdapter.Update(m_landTable); |
537 | MainLog.Instance.Verbose("DATASTORE", "Tedd debug: m_landAccessListDataAdapter.Update(m_landAccessListTable)"); | ||
538 | m_landAccessListDataAdapter.Update(m_landAccessListTable); | 532 | m_landAccessListDataAdapter.Update(m_landAccessListTable); |
539 | 533 | ||
540 | MainLog.Instance.Verbose("DATASTORE", "Tedd debug: m_dataSet.AcceptChanges()"); | ||
541 | m_dataSet.AcceptChanges(); | 534 | m_dataSet.AcceptChanges(); |
542 | } | 535 | } |
543 | 536 | ||
diff --git a/OpenSim/Region/Environment/LandManagement/LandManager.cs b/OpenSim/Region/Environment/LandManagement/LandManager.cs index 55a5b5f..c0c1b73 100644 --- a/OpenSim/Region/Environment/LandManagement/LandManager.cs +++ b/OpenSim/Region/Environment/LandManagement/LandManager.cs | |||
@@ -121,14 +121,15 @@ namespace OpenSim.Region.Environment.LandManagement | |||
121 | { | 121 | { |
122 | for (int i = 0; i < data.Count; i++) | 122 | for (int i = 0; i < data.Count; i++) |
123 | { | 123 | { |
124 | try | 124 | //try |
125 | { | 125 | //{ |
126 | IncomingLandObjectFromStorage(data[i]); | 126 | IncomingLandObjectFromStorage(data[i]); |
127 | } | 127 | //} |
128 | catch (Exception ex) | 128 | //catch (Exception ex) |
129 | { | 129 | //{ |
130 | MainLog.Instance.Error("LandManager", "IncomingLandObjectsFromStorage: Exception: " + ex.ToString()); | 130 | //MainLog.Instance.Error("LandManager", "IncomingLandObjectsFromStorage: Exception: " + ex.ToString()); |
131 | } | 131 | //throw ex; |
132 | //} | ||
132 | } | 133 | } |
133 | //foreach (LandData parcel in data) | 134 | //foreach (LandData parcel in data) |
134 | //{ | 135 | //{ |