diff options
| author | Melanie Thielker | 2008-10-07 21:59:56 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-10-07 21:59:56 +0000 |
| commit | 638cce09d141a27627c6fa1aa65647df064a6eff (patch) | |
| tree | b0672a13bdfbaa560199a6b593a325ada0b60b24 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
| parent | * Comment out debug throttle output that I had accidentally left in (diff) | |
| download | opensim-SC-638cce09d141a27627c6fa1aa65647df064a6eff.zip opensim-SC-638cce09d141a27627c6fa1aa65647df064a6eff.tar.gz opensim-SC-638cce09d141a27627c6fa1aa65647df064a6eff.tar.bz2 opensim-SC-638cce09d141a27627c6fa1aa65647df064a6eff.tar.xz | |
Restore "friendly errors" to the XEngine
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs index 43e3f3c..63ae6c7 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs | |||
| @@ -197,13 +197,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
| 197 | } | 197 | } |
| 198 | catch (TargetInvocationException tie) | 198 | catch (TargetInvocationException tie) |
| 199 | { | 199 | { |
| 200 | // Grab the inner exception and rethrow it, unless the inner | 200 | // Grab the inner exception and rethrow it, unless the inner |
| 201 | // exception is an EventAbortException as this indicates event | 201 | // exception is an EventAbortException as this indicates event |
| 202 | // invokation termination due to a state change. | 202 | // invocation termination due to a state change. |
| 203 | if ( !(tie.InnerException is EventAbortException) ) | 203 | // DO NOT THROW JUST THE INNER EXCEPTION! |
| 204 | { | 204 | // FriendlyErrors depends on getting the whole exception! |
| 205 | throw tie.InnerException; | 205 | // |
| 206 | } | 206 | if ( !(tie.InnerException is EventAbortException) ) |
| 207 | { | ||
| 208 | throw tie; | ||
| 209 | } | ||
| 207 | } | 210 | } |
| 208 | catch (Exception e) | 211 | catch (Exception e) |
| 209 | { | 212 | { |