diff options
| author | Justin Clark-Casey (justincc) | 2013-07-08 22:07:27 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-07-08 22:07:27 +0100 |
| commit | c3db5959441dbd1e04cdd32e92bda9eb5bf2853b (patch) | |
| tree | a7b262be4f9f0dc0c7c5464ce5d657351c53a63e /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |
| parent | Add "show caps stats by user" and "show caps stats by cap" console commands t... (diff) | |
| parent | Placed a throttle on UserManagementModule for name lookups. Singularity appar... (diff) | |
| download | opensim-SC_OLD-c3db5959441dbd1e04cdd32e92bda9eb5bf2853b.zip opensim-SC_OLD-c3db5959441dbd1e04cdd32e92bda9eb5bf2853b.tar.gz opensim-SC_OLD-c3db5959441dbd1e04cdd32e92bda9eb5bf2853b.tar.bz2 opensim-SC_OLD-c3db5959441dbd1e04cdd32e92bda9eb5bf2853b.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSScene.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 1 |
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 |