diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 17 |
2 files changed, 12 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 1734ab7..1730723 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -2045,6 +2045,7 @@ 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; | ||
2048 | } | 2049 | } |
2049 | }); | 2050 | }); |
2050 | 2051 | ||
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 16a8588..4d43943 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -149,6 +149,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
149 | 149 | ||
150 | #region Fields | 150 | #region Fields |
151 | 151 | ||
152 | public bool SuppressFinalizerLogging = false; | ||
153 | |||
152 | public bool AllowedDrop; | 154 | public bool AllowedDrop; |
153 | 155 | ||
154 | public bool DIE_AT_EDGE; | 156 | public bool DIE_AT_EDGE; |
@@ -350,15 +352,18 @@ namespace OpenSim.Region.Framework.Scenes | |||
350 | 352 | ||
351 | #endregion Fields | 353 | #endregion Fields |
352 | 354 | ||
353 | // ~SceneObjectPart() | 355 | ~SceneObjectPart() |
354 | // { | 356 | { |
357 | if (SuppressFinalizerLogging) | ||
358 | return; | ||
359 | |||
355 | // Console.WriteLine( | 360 | // Console.WriteLine( |
356 | // "[SCENE OBJECT PART]: Destructor called for {0}, local id {1}, parent {2} {3}", | 361 | // "[SCENE OBJECT PART]: Destructor called for {0}, local id {1}, parent {2} {3}", |
357 | // Name, LocalId, ParentGroup.Name, ParentGroup.LocalId); | 362 | // Name, LocalId, ParentGroup.Name, ParentGroup.LocalId); |
358 | // m_log.DebugFormat( | 363 | m_log.DebugFormat( |
359 | // "[SCENE OBJECT PART]: Destructor called for {0}, local id {1}, parent {2} {3}", | 364 | "[SCENE OBJECT PART]: Destructor called for {0}, local id {1}, parent {2} {3}", |
360 | // Name, LocalId, ParentGroup.Name, ParentGroup.LocalId); | 365 | Name, LocalId, ParentGroup.Name, ParentGroup.LocalId); |
361 | // } | 366 | } |
362 | 367 | ||
363 | #region Constructors | 368 | #region Constructors |
364 | 369 | ||