aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
diff options
context:
space:
mode:
authorDiva Canto2013-07-06 15:18:29 -0700
committerDiva Canto2013-07-06 15:18:29 -0700
commit93fd5e4036107573429464dd0c3794dff756f190 (patch)
tree1c2346f6f6e6183a392c6a1f2c399175910ec98b /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
parentSimina activity detector was too eager. Disabled it in case simian is not bei... (diff)
parentAdd implementations for llSetVelocity and llSetAngularVelocity. (diff)
downloadopensim-SC_OLD-93fd5e4036107573429464dd0c3794dff756f190.zip
opensim-SC_OLD-93fd5e4036107573429464dd0c3794dff756f190.tar.gz
opensim-SC_OLD-93fd5e4036107573429464dd0c3794dff756f190.tar.bz2
opensim-SC_OLD-93fd5e4036107573429464dd0c3794dff756f190.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSScene.cs1
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 1645c98..e56a6f6 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -785,7 +785,6 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
785 { 785 {
786 // The simulation of the time interval took less than realtime. 786 // The simulation of the time interval took less than realtime.
787 // Do a sleep for the rest of realtime. 787 // Do a sleep for the rest of realtime.
788 DetailLog("{0},BulletSPluginPhysicsThread,sleeping={1}", BSScene.DetailLogZero, simulationTimeVsRealtimeDifferenceMS);
789 Thread.Sleep(simulationTimeVsRealtimeDifferenceMS); 788 Thread.Sleep(simulationTimeVsRealtimeDifferenceMS);
790 } 789 }
791 else 790 else