From ab87a987f59fcba33e4685170a5b1c3fce825cbf Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 10 Oct 2008 23:18:52 +0000
Subject: Fix an exception handling issue in XEngine

---
 OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/ScriptEngine')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index e39a0c2..1d20377 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -613,7 +613,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                             m_InEvent = false;
                             m_CurrentEvent = String.Empty;
 
-                            if (!(e is TargetInvocationException) || !(e.InnerException is SelfDeleteException))
+                            if ((!(e is TargetInvocationException) || !(e.InnerException is SelfDeleteException)) && (!(e is ThreadAbortException)))
                             {
                                 try
                                 {
-- 
cgit v1.1