From 638cce09d141a27627c6fa1aa65647df064a6eff Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Tue, 7 Oct 2008 21:59:56 +0000
Subject: Restore "friendly errors" to the XEngine

---
 .../ScriptEngine/Shared/Instance/ScriptInstance.cs  | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine/Shared/Instance')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index dcf3043..e39a0c2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -613,27 +613,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                             m_InEvent = false;
                             m_CurrentEvent = String.Empty;
 
-                            if (!(e is TargetInvocationException) || (!(e.InnerException is EventAbortException) && (!(e.InnerException is SelfDeleteException))))
+                            if (!(e is TargetInvocationException) || !(e.InnerException is SelfDeleteException))
                             {
-                                if (e is System.Threading.ThreadAbortException)
-                                {
-                                    lock (m_EventQueue)
-                                    {
-                                        if ((m_EventQueue.Count > 0) && m_RunEvents && (!m_ShuttingDown))
-                                        {
-                                            m_CurrentResult=m_Engine.QueueEventHandler(this);
-                                        }
-                                        else
-                                        {
-                                            m_CurrentResult = null;
-                                        }
-                                    }
-
-                                    m_DetectParams = null;
-
-                                    return 0;
-                                }
-
                                 try
                                 {
                                     // DISPLAY ERROR INWORLD
-- 
cgit v1.1