Don't need to check separate physics status in bulletsim update since that method is only run for an indepndent thread anyway.

Also remove bulletsim monitored thread from watchdog on shutdown.

1 files changed, 3 insertions, 2 deletions

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 338593f..a46c241 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -862,9 +862,10 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
                 DetailLog("{0},BulletSPluginPhysicsThread,longerThanRealtime={1}", BSScene.DetailLogZero, simulationTimeVsRealtimeDifferenceMS);
             }
 
-            if (BSParam.UseSeparatePhysicsThread)
-                Watchdog.UpdateThread();
+            Watchdog.UpdateThread();
         }
+
+        Watchdog.RemoveThread();
     }
 
     #endregion // Simulation