Fix friendly errors in DNE as well

1 files changed, 10 insertions, 11 deletions

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs
index 1acb1b5..0f74b30 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs
@@ -290,20 +290,15 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
                                 InExecution = false;
                             }
                         }
-                        catch (SelfDeleteException sde) 
-                        {
-                            // Make sure this exception isn't consumed here... we need it
-                            throw sde;
-                        }
                         catch (TargetInvocationException tie)
                         {
-                            // Probably don't need to special case this one
-                            throw tie;
-                        }
-                        catch (Exception e)
-                        {
+                            Exception e = tie.InnerException;
+
+                            if (e is SelfDeleteException) // Forward it
+                                throw e;
+
                             InExecution = false;
-                            string text = FormatException(e, QIS.LineMap);
+                            string text = FormatException(tie, QIS.LineMap);
                             
                             // DISPLAY ERROR INWORLD
 
@@ -357,6 +352,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
                                 }
                             }
                         }
+                        catch (Exception e)
+                        {
+                            throw;
+                        }
                         finally
                         {
                             InExecution = false;