diff options
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 11 | ||||
-rw-r--r-- | prebuild.xml | 1 |
2 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index f7317c0..d3b2ad7 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |||
@@ -32,6 +32,7 @@ using System.Runtime.InteropServices; | |||
32 | using System.Text; | 32 | using System.Text; |
33 | using System.Threading; | 33 | using System.Threading; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Monitoring; | ||
35 | using OpenSim.Region.Framework; | 36 | using OpenSim.Region.Framework; |
36 | using OpenSim.Region.CoreModules; | 37 | using OpenSim.Region.CoreModules; |
37 | using Logging = OpenSim.Region.CoreModules.Framework.Statistics.Logging; | 38 | using Logging = OpenSim.Region.CoreModules.Framework.Statistics.Logging; |
@@ -286,9 +287,13 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters | |||
286 | if (BSParam.UseSeparatePhysicsThread) | 287 | if (BSParam.UseSeparatePhysicsThread) |
287 | { | 288 | { |
288 | // The physics simulation should happen independently of the heartbeat loop | 289 | // The physics simulation should happen independently of the heartbeat loop |
289 | m_physicsThread = new Thread(BulletSPluginPhysicsThread); | 290 | m_physicsThread |
290 | m_physicsThread.Name = BulletEngineName; | 291 | = Watchdog.StartThread( |
291 | m_physicsThread.Start(); | 292 | BulletSPluginPhysicsThread, |
293 | string.Format("{0} ({1})", BulletEngineName, RegionName), | ||
294 | ThreadPriority.Normal, | ||
295 | true, | ||
296 | false); | ||
292 | } | 297 | } |
293 | } | 298 | } |
294 | 299 | ||
diff --git a/prebuild.xml b/prebuild.xml index 006f545..ba18a2c 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -1746,6 +1746,7 @@ | |||
1746 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> | 1746 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> |
1747 | <Reference name="Nini.dll" path="../../../../bin/"/> | 1747 | <Reference name="Nini.dll" path="../../../../bin/"/> |
1748 | <Reference name="OpenSim.Framework"/> | 1748 | <Reference name="OpenSim.Framework"/> |
1749 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
1749 | <Reference name="OpenSim.Region.Framework"/> | 1750 | <Reference name="OpenSim.Region.Framework"/> |
1750 | <Reference name="OpenSim.Region.CoreModules"/> | 1751 | <Reference name="OpenSim.Region.CoreModules"/> |
1751 | <Reference name="OpenSim.Region.OptionalModules"/> | 1752 | <Reference name="OpenSim.Region.OptionalModules"/> |