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

this looks more like ubode

0.9.1.0-post-fixes
UbitUmarov 2019-01-21 01:59:33 +00:00
parent 81bb620d64
commit a287a8e121
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
View File

@ -281,8 +281,8 @@ namespace OpenSim.Region.PhysicsModule.ubOde
public IntPtr StaticSpace; // space for the static things around public IntPtr StaticSpace; // space for the static things around
public IntPtr GroundSpace; // space for ground public IntPtr GroundSpace; // space for ground
public Object OdeLock; public object OdeLock = new object();
public static Object SimulationLock; // public static object SimulationLock = new object();
public IMesher mesher; public IMesher mesher;
@ -310,8 +310,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
public ODEScene(Scene pscene, IConfigSource psourceconfig, string pname, string pversion, bool pOSOdeLib) public ODEScene(Scene pscene, IConfigSource psourceconfig, string pname, string pversion, bool pOSOdeLib)
{ {
OdeLock = new Object();
EngineType = pname; EngineType = pname;
PhysicsSceneName = EngineType + "/" + pscene.RegionInfo.RegionName; PhysicsSceneName = EngineType + "/" + pscene.RegionInfo.RegionName;
EngineName = pname + " " + pversion; EngineName = pname + " " + pversion;
@ -348,8 +346,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
{ {
SafeNativeMethods.AllocateODEDataForThread(~0U); SafeNativeMethods.AllocateODEDataForThread(~0U);
SimulationLock = new Object();
nearCallback = near; nearCallback = near;
m_rayCastManager = new ODERayCastRequestManager(this); m_rayCastManager = new ODERayCastRequestManager(this);
@ -1512,7 +1508,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
int nodeframes = 0; int nodeframes = 0;
float fps = 0; float fps = 0;
lock (SimulationLock)
lock(OdeLock) lock(OdeLock)
{ {
if (world == IntPtr.Zero) if (world == IntPtr.Zero)