diff options
| author | Melanie Thielker | 2008-10-10 23:18:52 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-10-10 23:18:52 +0000 |
| commit | ab87a987f59fcba33e4685170a5b1c3fce825cbf (patch) | |
| tree | 6eae005ed581867825485d1ee3e65a7cd0684560 /OpenSim/Region | |
| parent | * minor: remove warnings (diff) | |
| download | opensim-SC_OLD-ab87a987f59fcba33e4685170a5b1c3fce825cbf.zip opensim-SC_OLD-ab87a987f59fcba33e4685170a5b1c3fce825cbf.tar.gz opensim-SC_OLD-ab87a987f59fcba33e4685170a5b1c3fce825cbf.tar.bz2 opensim-SC_OLD-ab87a987f59fcba33e4685170a5b1c3fce825cbf.tar.xz | |
Fix an exception handling issue in XEngine
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
| 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 SelfDeleteException)) | 616 | if ((!(e is TargetInvocationException) || !(e.InnerException is SelfDeleteException)) && (!(e is ThreadAbortException))) |
| 617 | { | 617 | { |
| 618 | try | 618 | try |
| 619 | { | 619 | { |