OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs
View File

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