aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Instance
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-07 21:59:56 +0000
committerMelanie Thielker2008-10-07 21:59:56 +0000
commit638cce09d141a27627c6fa1aa65647df064a6eff (patch)
treeb0672a13bdfbaa560199a6b593a325ada0b60b24 /OpenSim/Region/ScriptEngine/Shared/Instance
parent* Comment out debug throttle output that I had accidentally left in (diff)
downloadopensim-SC_OLD-638cce09d141a27627c6fa1aa65647df064a6eff.zip
opensim-SC_OLD-638cce09d141a27627c6fa1aa65647df064a6eff.tar.gz
opensim-SC_OLD-638cce09d141a27627c6fa1aa65647df064a6eff.tar.bz2
opensim-SC_OLD-638cce09d141a27627c6fa1aa65647df064a6eff.tar.xz
Restore "friendly errors" to the XEngine
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs21
1 files changed, 1 insertions, 20 deletions
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
613 m_InEvent = false; 613 m_InEvent = false;
614 m_CurrentEvent = String.Empty; 614 m_CurrentEvent = String.Empty;
615 615
616 if (!(e is TargetInvocationException) || (!(e.InnerException is EventAbortException) && (!(e.InnerException is SelfDeleteException)))) 616 if (!(e is TargetInvocationException) || !(e.InnerException is SelfDeleteException))
617 { 617 {
618 if (e is System.Threading.ThreadAbortException)
619 {
620 lock (m_EventQueue)
621 {
622 if ((m_EventQueue.Count > 0) && m_RunEvents && (!m_ShuttingDown))
623 {
624 m_CurrentResult=m_Engine.QueueEventHandler(this);
625 }
626 else
627 {
628 m_CurrentResult = null;
629 }
630 }
631
632 m_DetectParams = null;
633
634 return 0;
635 }
636
637 try 618 try
638 { 619 {
639 // DISPLAY ERROR INWORLD 620 // DISPLAY ERROR INWORLD