OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Add instrumentation to log finalizer being called. Suppressed for backup" 

This reverts commit ea91a36483.
avinationmerge
Melanie 2012-07-12 01:01:43 +02:00
parent bae35ad97e
commit 906ac4adc4
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -2045,7 +2045,6 @@ namespace OpenSim.Region.Framework.Scenes
{ {
part.KeyframeMotion = KeyframeMotion.FromData(backup_group, part.KeyframeMotion.Serialize()); part.KeyframeMotion = KeyframeMotion.FromData(backup_group, part.KeyframeMotion.Serialize());
part.KeyframeMotion.UpdateSceneObject(this); part.KeyframeMotion.UpdateSceneObject(this);
part.SuppressFinalizerLogging = true;
} }
}); });

17
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -149,8 +149,6 @@ namespace OpenSim.Region.Framework.Scenes
#region Fields #region Fields
public bool SuppressFinalizerLogging = false;
public bool AllowedDrop; public bool AllowedDrop;
public bool DIE_AT_EDGE; public bool DIE_AT_EDGE;
@ -352,18 +350,15 @@ namespace OpenSim.Region.Framework.Scenes
#endregion Fields #endregion Fields
~SceneObjectPart() // ~SceneObjectPart()
{ // {
if (SuppressFinalizerLogging)
return;
// Console.WriteLine( // Console.WriteLine(
// "[SCENE OBJECT PART]: Destructor called for {0}, local id {1}, parent {2} {3}", // "[SCENE OBJECT PART]: Destructor called for {0}, local id {1}, parent {2} {3}",
// Name, LocalId, ParentGroup.Name, ParentGroup.LocalId); // Name, LocalId, ParentGroup.Name, ParentGroup.LocalId);
m_log.DebugFormat( // m_log.DebugFormat(
"[SCENE OBJECT PART]: Destructor called for {0}, local id {1}, parent {2} {3}", // "[SCENE OBJECT PART]: Destructor called for {0}, local id {1}, parent {2} {3}",
Name, LocalId, ParentGroup.Name, ParentGroup.LocalId); // Name, LocalId, ParentGroup.Name, ParentGroup.LocalId);
} // }
#region Constructors #region Constructors