Fix friendly errors in DNE as well

0.6.0-stable
Melanie Thielker 2008-10-08 00:04:28 +00:00
parent 8d2ec1ac71
commit 4bb9f0f429
1 changed files with 10 additions and 11 deletions

View File

@ -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;