diff options
author | Tedd Hansen | 2008-01-19 11:17:12 +0000 |
---|---|---|
committer | Tedd Hansen | 2008-01-19 11:17:12 +0000 |
commit | ca772be0d4616bffde294a404c4a601cf5575f13 (patch) | |
tree | e962b4ee6e88052bd3af9775d9d1985254599e55 | |
parent | Still looking for that startup crash bug. Added some exception handling in pr... (diff) | |
download | opensim-SC_OLD-ca772be0d4616bffde294a404c4a601cf5575f13.zip opensim-SC_OLD-ca772be0d4616bffde294a404c4a601cf5575f13.tar.gz opensim-SC_OLD-ca772be0d4616bffde294a404c4a601cf5575f13.tar.bz2 opensim-SC_OLD-ca772be0d4616bffde294a404c4a601cf5575f13.tar.xz |
Still hunting, added debug output
-rw-r--r-- | OpenSim/Framework/Data.MySQL/MySQLDataStore.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 13 |
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 | |||
291 | } | 291 | } |
292 | catch (Exception ex) | 292 | catch (Exception ex) |
293 | { | 293 | { |
294 | MainLog.Instance.Error("DATASTORE", "Exception trying to load prim objects: " + ex.ToString()); | 294 | MainLog.Instance.Error("DATASTORE", "Exception trying to load prim objects for region " + regionUUID + ": " + ex.ToString()); |
295 | } | 295 | } |
296 | return retvals; | 296 | return retvals; |
297 | } | 297 | } |
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 | |||
519 | /// </summary> | 519 | /// </summary> |
520 | public void StartTimer() | 520 | public void StartTimer() |
521 | { | 521 | { |
522 | MainLog.Instance.Debug("SCENE", "Starting timer") | ||
522 | m_heartbeatTimer.Enabled = true; | 523 | m_heartbeatTimer.Enabled = true; |
523 | m_heartbeatTimer.Interval = (int) (m_timespan*1000); | 524 | m_heartbeatTimer.Interval = (int) (m_timespan*1000); |
524 | m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat); | 525 | m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat); |
@@ -908,6 +909,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
908 | { | 909 | { |
909 | m_LandManager.IncomingLandObjectsFromStorage(landData); | 910 | m_LandManager.IncomingLandObjectsFromStorage(landData); |
910 | } | 911 | } |
912 | MainLog.Instance.Debug("SCENE", "Done loading land objects from storage"); | ||
911 | } | 913 | } |
912 | 914 | ||
913 | #endregion | 915 | #endregion |
@@ -1701,10 +1703,15 @@ namespace OpenSim.Region.Environment.Scenes | |||
1701 | /// </summary> | 1703 | /// </summary> |
1702 | public void performParcelPrimCountUpdate() | 1704 | public void performParcelPrimCountUpdate() |
1703 | { | 1705 | { |
1704 | m_LandManager.resetAllLandPrimCounts(); | 1706 | MainLog.Instance.Debug("SCENE", "Performing parcel prim count update: resetAllLandPrimCounts()"); |
1705 | m_eventManager.TriggerParcelPrimCountUpdate(); | 1707 | m_LandManager.resetAllLandPrimCounts(); |
1706 | m_LandManager.finalizeLandPrimCountUpdate(); | 1708 | MainLog.Instance.Debug("SCENE", "Performing parcel prim count update: TriggerParcelPrimCountUpdate()"); |
1709 | m_eventManager.TriggerParcelPrimCountUpdate(); | ||
1710 | MainLog.Instance.Debug("SCENE", "Performing parcel prim count update: finalizeLandPrimCountUpdate()"); | ||
1711 | m_LandManager.finalizeLandPrimCountUpdate(); | ||
1712 | MainLog.Instance.Debug("SCENE", "Performing parcel prim count update: landPrimCountTainted = false"); | ||
1707 | m_LandManager.landPrimCountTainted = false; | 1713 | m_LandManager.landPrimCountTainted = false; |
1714 | MainLog.Instance.Debug("SCENE", "Performing parcel prim count update: Done"); | ||
1708 | } | 1715 | } |
1709 | 1716 | ||
1710 | /// <summary> | 1717 | /// <summary> |