From badeefdf992c043ef85bbc80a0f97d319f645e34 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Wed, 3 Sep 2014 23:53:04 +0100
Subject: [PATCH] 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.
---
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 338593f75e..a46c241db3 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