From cc635a651a57ff30ab55d34c8ba9f448e3a64799 Mon Sep 17 00:00:00 2001
From: Tedd Hansen
Date: Sat, 19 Jan 2008 22:23:22 +0000
Subject: Most is back in its original state :) Hope I didn't break anything...
 *looks innocent*

---
 OpenSim/Framework/Data.MySQL/MySQLDataStore.cs           |  7 -------
 OpenSim/Region/Environment/LandManagement/LandManager.cs | 15 ++++++++-------
 2 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'OpenSim')

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
 
                 // DisplayDataSet(m_dataSet, "Region DataSet");
 
-            MainLog.Instance.Verbose("DATASTORE", "Tedd debug: m_primDataAdapter.Update(m_primTable)");
                 m_primDataAdapter.Update(m_primTable);
-                MainLog.Instance.Verbose("DATASTORE", "Tedd debug: m_shapeDataAdapter.Update(m_shapeTable)");
                 m_shapeDataAdapter.Update(m_shapeTable);
                 
                 if (persistPrimInventories)
                 {
-                    MainLog.Instance.Verbose("DATASTORE", "Tedd debug: m_itemsDataAdapter.Update(m_itemsTable)");
                     m_itemsDataAdapter.Update(m_itemsTable);
                 }
 
-                MainLog.Instance.Verbose("DATASTORE", "Tedd debug: m_terrainDataAdapter.Update(m_terrainTable)");
                 m_terrainDataAdapter.Update(m_terrainTable);
-                MainLog.Instance.Verbose("DATASTORE", "Tedd debug: m_landDataAdapter.Update(m_landTable)");
                 m_landDataAdapter.Update(m_landTable);
-                MainLog.Instance.Verbose("DATASTORE", "Tedd debug: m_landAccessListDataAdapter.Update(m_landAccessListTable)");
                 m_landAccessListDataAdapter.Update(m_landAccessListTable);
 
-                MainLog.Instance.Verbose("DATASTORE", "Tedd debug: m_dataSet.AcceptChanges()");
                 m_dataSet.AcceptChanges();
         }
 
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
         {
             for (int i = 0; i < data.Count; i++)
             {
-                try
-                {
+                //try
+                //{
                     IncomingLandObjectFromStorage(data[i]);
-                }
-                catch (Exception ex)
-                {
-                    MainLog.Instance.Error("LandManager", "IncomingLandObjectsFromStorage: Exception: " + ex.ToString());
-                }
+                //}
+                //catch (Exception ex)
+                //{
+                    //MainLog.Instance.Error("LandManager", "IncomingLandObjectsFromStorage: Exception: " + ex.ToString());
+                    //throw ex;
+                //}
             }
             //foreach (LandData parcel in data)
             //{
-- 
cgit v1.1