From a287a8e121d5369cf8a7bcedfa10e06aac932553 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 21 Jan 2019 01:59:33 +0000 Subject: [PATCH] this looks more like ubode --- OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs index c23178792c..b53bedadb2 100644 --- a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs +++ b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs @@ -281,8 +281,8 @@ namespace OpenSim.Region.PhysicsModule.ubOde public IntPtr StaticSpace; // space for the static things around public IntPtr GroundSpace; // space for ground - public Object OdeLock; - public static Object SimulationLock; + public object OdeLock = new object(); +// public static object SimulationLock = new object(); public IMesher mesher; @@ -310,8 +310,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde public ODEScene(Scene pscene, IConfigSource psourceconfig, string pname, string pversion, bool pOSOdeLib) { - OdeLock = new Object(); - EngineType = pname; PhysicsSceneName = EngineType + "/" + pscene.RegionInfo.RegionName; EngineName = pname + " " + pversion; @@ -348,8 +346,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde { SafeNativeMethods.AllocateODEDataForThread(~0U); - SimulationLock = new Object(); - nearCallback = near; m_rayCastManager = new ODERayCastRequestManager(this); @@ -1512,8 +1508,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde int nodeframes = 0; float fps = 0; - lock (SimulationLock) - lock(OdeLock) + lock(OdeLock) { if (world == IntPtr.Zero) {