aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-07-29 01:21:15 +0100
committerJustin Clark-Casey (justincc)2014-07-29 01:21:15 +0100
commit3654ae8d8cea0bf0455974efe18ff99e484d2893 (patch)
tree4daebd94efd967de9d64f69ace7d057f514635e6 /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
parentminor: make "debug scene set" usage command accurate again from last commit f... (diff)
downloadopensim-SC_OLD-3654ae8d8cea0bf0455974efe18ff99e484d2893.zip
opensim-SC_OLD-3654ae8d8cea0bf0455974efe18ff99e484d2893.tar.gz
opensim-SC_OLD-3654ae8d8cea0bf0455974efe18ff99e484d2893.tar.bz2
opensim-SC_OLD-3654ae8d8cea0bf0455974efe18ff99e484d2893.tar.xz
Allow the "debug scene set physics false|true" command to work when bulletsim physics is running in a separate thread.
This will also allow the "disable physics" setting in the region debug viewer dialog to work in this circumstance.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSScene.cs')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSScene.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 17d26a9..e517389 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -821,7 +821,10 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
821 while (m_initialized) 821 while (m_initialized)
822 { 822 {
823 int beginSimulationRealtimeMS = Util.EnvironmentTickCount(); 823 int beginSimulationRealtimeMS = Util.EnvironmentTickCount();
824 DoPhysicsStep(BSParam.PhysicsTimeStep); 824
825 if (BSParam.Active)
826 DoPhysicsStep(BSParam.PhysicsTimeStep);
827
825 int simulationRealtimeMS = Util.EnvironmentTickCountSubtract(beginSimulationRealtimeMS); 828 int simulationRealtimeMS = Util.EnvironmentTickCountSubtract(beginSimulationRealtimeMS);
826 int simulationTimeVsRealtimeDifferenceMS = ((int)(BSParam.PhysicsTimeStep*1000f)) - simulationRealtimeMS; 829 int simulationTimeVsRealtimeDifferenceMS = ((int)(BSParam.PhysicsTimeStep*1000f)) - simulationRealtimeMS;
827 830