ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-08 05:36:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Restore "friendly errors" to the XEngine

Browse Source
This commit is contained in:
Melanie Thielker
2008-10-07 21:59:56 +00:00
parent 4ed6e78d1a
commit 638cce09d1
4 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@@ -613,27 +613,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
m_InEvent = false;
m_CurrentEvent = String.Empty;
if (!(e is TargetInvocationException) || (!(e.InnerException is EventAbortException) && (!(e.InnerException is SelfDeleteException))))
if (!(e is TargetInvocationException) || !(e.InnerException is SelfDeleteException))
{
if (e is System.Threading.ThreadAbortException)
{
lock (m_EventQueue)
{
if ((m_EventQueue.Count > 0) && m_RunEvents && (!m_ShuttingDown))
{
m_CurrentResult=m_Engine.QueueEventHandler(this);
}
else
{
m_CurrentResult = null;
}
}
m_DetectParams = null;
return 0;
}
try
{
// DISPLAY ERROR INWORLD