diff options
| author | Melanie | 2012-11-19 22:53:03 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-19 22:53:03 +0000 |
| commit | 9f2d232c71d76a7e652f7dbae05051e62ab558d7 (patch) | |
| tree | 84f6d25a5f17d88984b23fe8e1c72a95f9a3b00e /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | BulletSim: Use base class constructors for initialization of BSShape and othe... (diff) | |
| download | opensim-SC-9f2d232c71d76a7e652f7dbae05051e62ab558d7.zip opensim-SC-9f2d232c71d76a7e652f7dbae05051e62ab558d7.tar.gz opensim-SC-9f2d232c71d76a7e652f7dbae05051e62ab558d7.tar.bz2 opensim-SC-9f2d232c71d76a7e652f7dbae05051e62ab558d7.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSScene.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index 1cc607a..2fee95e 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |||
| @@ -683,7 +683,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters | |||
| 683 | #region Taints | 683 | #region Taints |
| 684 | 684 | ||
| 685 | // Calls to the PhysicsActors can't directly call into the physics engine | 685 | // Calls to the PhysicsActors can't directly call into the physics engine |
| 686 | // because it might be busy. We delay changes to a known time. | 686 | // because it might be busy. We delay changes to a known time. |
| 687 | // We rely on C#'s closure to save and restore the context for the delegate. | 687 | // We rely on C#'s closure to save and restore the context for the delegate. |
| 688 | public void TaintedObject(String ident, TaintCallback callback) | 688 | public void TaintedObject(String ident, TaintCallback callback) |
| 689 | { | 689 | { |