aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-09-03 23:53:04 +0100
committerJustin Clark-Casey (justincc)2014-09-03 23:53:04 +0100
commit4b04d22899e954831c4bf0904b5c2d9adacf650a (patch)
tree40b3021c403e51f0a9499d0db9fb9c361e0f7551 /OpenSim/Region
parentMake bulletsim thread alarm if no update for 5 seconds. (diff)
downloadopensim-SC-4b04d22899e954831c4bf0904b5c2d9adacf650a.zip
opensim-SC-4b04d22899e954831c4bf0904b5c2d9adacf650a.tar.gz
opensim-SC-4b04d22899e954831c4bf0904b5c2d9adacf650a.tar.bz2
opensim-SC-4b04d22899e954831c4bf0904b5c2d9adacf650a.tar.xz
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.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSScene.cs5
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
862 DetailLog("{0},BulletSPluginPhysicsThread,longerThanRealtime={1}", BSScene.DetailLogZero, simulationTimeVsRealtimeDifferenceMS); 862 DetailLog("{0},BulletSPluginPhysicsThread,longerThanRealtime={1}", BSScene.DetailLogZero, simulationTimeVsRealtimeDifferenceMS);
863 } 863 }
864 864
865 if (BSParam.UseSeparatePhysicsThread) 865 Watchdog.UpdateThread();
866 Watchdog.UpdateThread();
867 } 866 }
867
868 Watchdog.RemoveThread();
868 } 869 }
869 870
870 #endregion // Simulation 871 #endregion // Simulation