From 516ec4acd01d70276329d251155775cedf7b8941 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sun, 25 Jul 2010 08:11:39 +0200
Subject: Eat a lockign exception that kills scripts. May bear more
 investigation in the long run.

---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 24d260e..dbf493c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -136,12 +136,21 @@ namespace OpenSim.Region.Framework.Scenes
                 if (m_partsLock.RecursiveReadCount > 0)
                 {
                     m_log.Error("[SceneObjectGroup.m_parts] Recursive read lock requested. This should not happen and means something needs to be fixed. For now though, it's safe to continue.");
-                    m_partsLock.ExitReadLock();
+                    try
+                    {
+                        m_partsLock.ExitReadLock();
+                    }
+                    catch { } // Ignore errors, to allow resync
                 }
                 if (m_partsLock.RecursiveWriteCount > 0)
                 {
                     m_log.Error("[SceneObjectGroup.m_parts] Recursive read lock requested (write lock exists on this thread). This should not happen and means something needs to be fixed.");
-                    m_partsLock.ExitWriteLock();
+                    try
+                    {
+                        m_partsLock.ExitWriteLock();
+                    }
+                    catch { }
+
                 }
 
                 while (!m_partsLock.TryEnterReadLock(60000))
-- 
cgit v1.1