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

More exception catching in ODE at shutdown. Not sure why the exception happens.

avinationmerge
Diva Canto 2015-10-14 17:57:13 -07:00
parent 073bdda4b8
commit e14e432b50
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
View File

@ -40,6 +40,7 @@ using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Runtime.ExceptionServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Threading; using System.Threading;
using log4net; using log4net;
@ -4055,6 +4056,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
} }
} }
*/ */
[HandleProcessCorruptedStateExceptions]
public override void Dispose() public override void Dispose()
{ {
_worldInitialized = false; _worldInitialized = false;
@ -4079,7 +4081,14 @@ namespace OpenSim.Region.PhysicsModule.ODE
//{ //{
//RemoveAvatar(act); //RemoveAvatar(act);
//} //}
d.WorldDestroy(world); try
{
d.WorldDestroy(world);
}
catch (AccessViolationException e)
{
m_log.ErrorFormat("[ODE SCENE]: exception {0}", e.Message);
}
//d.CloseODE(); //d.CloseODE();
} }