2 files changed, 11 insertions, 4 deletions

diff --git a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
index cadd9fc..5a9aba9 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
@@ -291,7 +291,7 @@ namespace OpenSim.Framework.Data.MySQL
             }
             catch (Exception ex)
             {
-                MainLog.Instance.Error("DATASTORE", "Exception trying to load prim objects: " + ex.ToString());
+                MainLog.Instance.Error("DATASTORE", "Exception trying to load prim objects for region " + regionUUID + ": " + ex.ToString());
             }
             return retvals;
         }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index c6f9aff..4e9db5c 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -519,6 +519,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         public void StartTimer()
         {
+            MainLog.Instance.Debug("SCENE", "Starting timer")
             m_heartbeatTimer.Enabled = true;
             m_heartbeatTimer.Interval = (int) (m_timespan*1000);
             m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat);
@@ -908,6 +909,7 @@ namespace OpenSim.Region.Environment.Scenes
                 {
                     m_LandManager.IncomingLandObjectsFromStorage(landData);
                 }
+                MainLog.Instance.Debug("SCENE", "Done loading land objects from storage");
         }
 
         #endregion
@@ -1701,10 +1703,15 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         public void performParcelPrimCountUpdate()
         {
-                m_LandManager.resetAllLandPrimCounts();
-                m_eventManager.TriggerParcelPrimCountUpdate();
-                m_LandManager.finalizeLandPrimCountUpdate();
+            MainLog.Instance.Debug("SCENE", "Performing parcel prim count update: resetAllLandPrimCounts()");
+            m_LandManager.resetAllLandPrimCounts();
+            MainLog.Instance.Debug("SCENE", "Performing parcel prim count update: TriggerParcelPrimCountUpdate()");
+            m_eventManager.TriggerParcelPrimCountUpdate();
+            MainLog.Instance.Debug("SCENE", "Performing parcel prim count update: finalizeLandPrimCountUpdate()");
+            m_LandManager.finalizeLandPrimCountUpdate();
+            MainLog.Instance.Debug("SCENE", "Performing parcel prim count update: landPrimCountTainted = false");
                 m_LandManager.landPrimCountTainted = false;
+                MainLog.Instance.Debug("SCENE", "Performing parcel prim count update: Done");
         }
 
         /// <summary>