mirror of
https://github.com/opensim/opensim.git
synced 2026-06-19 12:03:01 +08:00
Fix friendly errors in DNE as well
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user