removed additional debugging, added temp mega-debugging to StoreLandObject

4 files changed, 19 insertions, 27 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
         {
             lock (m_dataSet)
             {
+                MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 1");
                 DataTable land = m_landTable;
+                MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 2");
                 DataTable landaccesslist = m_landAccessListTable;
 
+                MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 3");
                 DataRow landRow = land.Rows.Find(Util.ToRawUuidString(parcel.landData.globalID));
+                MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 4");
                 if (landRow == null)
                 {
+                    MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 5");
                     landRow = land.NewRow();
+                    MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 6");
                     fillLandRow(landRow, parcel.landData, regionUUID);
+                    MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 7");
                     land.Rows.Add(landRow);
                 }
                 else
                 {
+                    MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 8");
                     fillLandRow(landRow, parcel.landData, regionUUID);
                 }
 
+                MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 9");
                 using (
                     MySqlCommand cmd =
                         new MySqlCommand("delete from landaccesslist where LandUUID=?LandUUID", m_connection))
                 {
+                    MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 10");
                     cmd.Parameters.Add(new MySqlParameter("?LandUUID", Util.ToRawUuidString(parcel.landData.globalID)));
+                    MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 11");
                     cmd.ExecuteNonQuery();
                 }
 
+                MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 12");
+                int i = 0;
                 foreach (ParcelManager.ParcelAccessEntry entry in parcel.landData.parcelAccessList)
                 {
+                    i++;
+                    MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 12:1:" + i);
                     DataRow newAccessRow = landaccesslist.NewRow();
+                    MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 12:2:" + i);
                     fillLandAccessRow(newAccessRow, entry, parcel.landData.globalID);
+                    MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 12:3:" + i);
                     landaccesslist.Rows.Add(newAccessRow);
                 }
             }
 
+            MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 13");
             Commit();
+            MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 14");
         }
 
         public List<LandData> LoadLandObjects(LLUUID regionUUID)
diff --git a/OpenSim/Region/Environment/LandManagement/Land.cs b/OpenSim/Region/Environment/LandManagement/Land.cs
index cd56aae..7cc8519 100644
--- a/OpenSim/Region/Environment/LandManagement/Land.cs
+++ b/OpenSim/Region/Environment/LandManagement/Land.cs
@@ -447,14 +447,8 @@ namespace OpenSim.Region.Environment.LandManagement
         /// </summary>
         public void forceUpdateLandInfo()
         {
-            // TODO: REMOVE (TEDD)
-            MainLog.Instance.Verbose("LandManager", "updateAABBAndAreaValues()");
             updateAABBAndAreaValues();
-            // TODO: REMOVE (TEDD)
-            MainLog.Instance.Verbose("LandManager", "updateLandBitmapByteArray()");
             updateLandBitmapByteArray();
-            // TODO: REMOVE (TEDD)
-            MainLog.Instance.Verbose("LandManager", "end of forceUpdateLandInfo()");
         }
 
         public void setLandBitmapFromByteArray()
diff --git a/OpenSim/Region/Environment/LandManagement/LandManager.cs b/OpenSim/Region/Environment/LandManagement/LandManager.cs
index 155c91f..55a5b5f 100644
--- a/OpenSim/Region/Environment/LandManagement/LandManager.cs
+++ b/OpenSim/Region/Environment/LandManagement/LandManager.cs
@@ -138,17 +138,9 @@ namespace OpenSim.Region.Environment.LandManagement
 
         public void IncomingLandObjectFromStorage(LandData data)
         {
-            // TODO: REMOVE (TEDD)
-            MainLog.Instance.Verbose("LandManager", "IncomingLandObjectFromStorage: " + data.localID);
             Land new_land = new Land(data.ownerID, data.isGroupOwned, m_scene);
-            // TODO: REMOVE (TEDD)
-            MainLog.Instance.Verbose("LandManager", "IncomingLandObjectFromStorage: data.Copy()");
             new_land.landData = data.Copy();
-            // TODO: REMOVE (TEDD)
-            MainLog.Instance.Verbose("LandManager", "IncomingLandObjectFromStorage: new_land.setLandBitmapFromByteArray()");
             new_land.setLandBitmapFromByteArray();
-            // TODO: REMOVE (TEDD)
-            MainLog.Instance.Verbose("LandManager", "IncomingLandObjectFromStorage: addLandObject(new_land)");
             addLandObject(new_land);
         }
 
@@ -177,15 +169,11 @@ namespace OpenSim.Region.Environment.LandManagement
         /// <param name="new_land">The land object being added</param>
         public Land addLandObject(Land new_land)
         {
-            // TODO: REMOVE (TEDD)
-            MainLog.Instance.Verbose("LandManager", "addLandObject()");
             lastLandLocalID++;
             new_land.landData.localID = lastLandLocalID;
             landList.Add(lastLandLocalID, new_land.Copy());
 
 
-            // TODO: REMOVE (TEDD)
-            MainLog.Instance.Verbose("LandManager", "new_land.getLandBitmap()");
             bool[,] landBitmap = new_land.getLandBitmap();
             int x, y;
             for (x = 0; x < 64; x++)
@@ -198,12 +186,8 @@ namespace OpenSim.Region.Environment.LandManagement
                     }
                 }
             }
-            // TODO: REMOVE (TEDD)
-            MainLog.Instance.Verbose("LandManager", "forceUpdateLandInfo()");
             landList[lastLandLocalID].forceUpdateLandInfo();
-            MainLog.Instance.Verbose("LandManager", "TriggerLandObjectAdded");
             m_scene.EventManager.TriggerLandObjectAdded(new_land, m_scene.RegionInfo.RegionID);
-            MainLog.Instance.Verbose("LandManager", "end of addLandObject()");
             return new_land;
         }
 
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 9e13fe7..f327b2b 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1703,15 +1703,10 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         public void performParcelPrimCountUpdate()
         {
-            MainLog.Instance.Verbose("SCENE", "Performing parcel prim count update: resetAllLandPrimCounts()");
             m_LandManager.resetAllLandPrimCounts();
-            MainLog.Instance.Verbose("SCENE", "Performing parcel prim count update: TriggerParcelPrimCountUpdate()");
             m_eventManager.TriggerParcelPrimCountUpdate();
-            MainLog.Instance.Verbose("SCENE", "Performing parcel prim count update: finalizeLandPrimCountUpdate()");
             m_LandManager.finalizeLandPrimCountUpdate();
-            MainLog.Instance.Verbose("SCENE", "Performing parcel prim count update: landPrimCountTainted = false");
                 m_LandManager.landPrimCountTainted = false;
-                MainLog.Instance.Verbose("SCENE", "Performing parcel prim count update: Done");
         }
 
         /// <summary>