From 906ac4adc4adc8eef84a584b73323fda25127806 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 12 Jul 2012 01:01:43 +0200
Subject: Revert "Add instrumentation to log finalizer being called. Suppressed
 for backup"

This reverts commit ea91a36483f3eba90e16b664715d152f9eca2980.
---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs |  1 -
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs  | 17 ++++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'OpenSim')

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
                             {
                                 part.KeyframeMotion = KeyframeMotion.FromData(backup_group, part.KeyframeMotion.Serialize());
                                 part.KeyframeMotion.UpdateSceneObject(this);
-                                part.SuppressFinalizerLogging = true;
                             }
                         });
 
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
 
         #region Fields
 
-        public bool SuppressFinalizerLogging = false;
-
         public bool AllowedDrop;
         
         public bool DIE_AT_EDGE;
@@ -352,18 +350,15 @@ namespace OpenSim.Region.Framework.Scenes
 
         #endregion Fields
 
-        ~SceneObjectPart()
-        {
-            if (SuppressFinalizerLogging)
-                return;
-
+//        ~SceneObjectPart()
+//        {
 //            Console.WriteLine(
 //                "[SCENE OBJECT PART]: Destructor called for {0}, local id {1}, parent {2} {3}",
 //                Name, LocalId, ParentGroup.Name, ParentGroup.LocalId);
-            m_log.DebugFormat(
-                "[SCENE OBJECT PART]: Destructor called for {0}, local id {1}, parent {2} {3}",
-                Name, LocalId, ParentGroup.Name, ParentGroup.LocalId);
-        }
+//            m_log.DebugFormat(
+//                "[SCENE OBJECT PART]: Destructor called for {0}, local id {1}, parent {2} {3}",
+//                Name, LocalId, ParentGroup.Name, ParentGroup.LocalId);
+//        }
 
         #region Constructors
 
-- 
cgit v1.1