diff options
author | Melanie | 2012-07-12 01:01:43 +0200 |
---|---|---|
committer | Melanie | 2012-07-12 01:01:43 +0200 |
commit | 906ac4adc4adc8eef84a584b73323fda25127806 (patch) | |
tree | a48eb67fb11bf9170f51258320c1bc60470398a0 /OpenSim/Region/Framework | |
parent | Revert "Place instrumentation in the proper place. This needs reverting, too!" (diff) | |
download | opensim-SC_OLD-906ac4adc4adc8eef84a584b73323fda25127806.zip opensim-SC_OLD-906ac4adc4adc8eef84a584b73323fda25127806.tar.gz opensim-SC_OLD-906ac4adc4adc8eef84a584b73323fda25127806.tar.bz2 opensim-SC_OLD-906ac4adc4adc8eef84a584b73323fda25127806.tar.xz |
Revert "Add instrumentation to log finalizer being called. Suppressed for backup"
This reverts commit ea91a36483f3eba90e16b664715d152f9eca2980.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 17 |
2 files changed, 6 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 1730723..1734ab7 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -2045,7 +2045,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2045 | { | 2045 | { |
2046 | part.KeyframeMotion = KeyframeMotion.FromData(backup_group, part.KeyframeMotion.Serialize()); | 2046 | part.KeyframeMotion = KeyframeMotion.FromData(backup_group, part.KeyframeMotion.Serialize()); |
2047 | part.KeyframeMotion.UpdateSceneObject(this); | 2047 | part.KeyframeMotion.UpdateSceneObject(this); |
2048 | part.SuppressFinalizerLogging = true; | ||
2049 | } | 2048 | } |
2050 | }); | 2049 | }); |
2051 | 2050 | ||
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 4d43943..16a8588 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -149,8 +149,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
149 | 149 | ||
150 | #region Fields | 150 | #region Fields |
151 | 151 | ||
152 | public bool SuppressFinalizerLogging = false; | ||
153 | |||
154 | public bool AllowedDrop; | 152 | public bool AllowedDrop; |
155 | 153 | ||
156 | public bool DIE_AT_EDGE; | 154 | public bool DIE_AT_EDGE; |
@@ -352,18 +350,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
352 | 350 | ||
353 | #endregion Fields | 351 | #endregion Fields |
354 | 352 | ||
355 | ~SceneObjectPart() | 353 | // ~SceneObjectPart() |
356 | { | 354 | // { |
357 | if (SuppressFinalizerLogging) | ||
358 | return; | ||
359 | |||
360 | // Console.WriteLine( | 355 | // Console.WriteLine( |
361 | // "[SCENE OBJECT PART]: Destructor called for {0}, local id {1}, parent {2} {3}", | 356 | // "[SCENE OBJECT PART]: Destructor called for {0}, local id {1}, parent {2} {3}", |
362 | // Name, LocalId, ParentGroup.Name, ParentGroup.LocalId); | 357 | // Name, LocalId, ParentGroup.Name, ParentGroup.LocalId); |
363 | m_log.DebugFormat( | 358 | // m_log.DebugFormat( |
364 | "[SCENE OBJECT PART]: Destructor called for {0}, local id {1}, parent {2} {3}", | 359 | // "[SCENE OBJECT PART]: Destructor called for {0}, local id {1}, parent {2} {3}", |
365 | Name, LocalId, ParentGroup.Name, ParentGroup.LocalId); | 360 | // Name, LocalId, ParentGroup.Name, ParentGroup.LocalId); |
366 | } | 361 | // } |
367 | 362 | ||
368 | #region Constructors | 363 | #region Constructors |
369 | 364 | ||