diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Region/PhysicsModules/BulletS/BSScene.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/PhysicsModules/BulletS/BSScene.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs b/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs index ee57f0c..7ff0a07 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs | |||
| @@ -351,12 +351,12 @@ namespace OpenSim.Region.PhysicsModule.BulletS | |||
| 351 | if (BSParam.UseSeparatePhysicsThread) | 351 | if (BSParam.UseSeparatePhysicsThread) |
| 352 | { | 352 | { |
| 353 | // The physics simulation should happen independently of the heartbeat loop | 353 | // The physics simulation should happen independently of the heartbeat loop |
| 354 | m_physicsThread | 354 | m_physicsThread |
| 355 | = WorkManager.StartThread( | 355 | = WorkManager.StartThread( |
| 356 | BulletSPluginPhysicsThread, | 356 | BulletSPluginPhysicsThread, |
| 357 | string.Format("{0} ({1})", BulletEngineName, RegionName), | 357 | string.Format("{0} ({1})", BulletEngineName, RegionName), |
| 358 | ThreadPriority.Normal, | 358 | ThreadPriority.Normal, |
| 359 | true, | 359 | true, |
| 360 | true); | 360 | true); |
| 361 | } | 361 | } |
| 362 | } | 362 | } |