diff options
| author | Melanie | 2013-05-04 01:22:12 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-04 01:22:12 +0100 |
| commit | 3aa83738e2a845d05bb25ab81634d0540971c0bf (patch) | |
| tree | 411d946b817b020c72f3d9a35926215e28bf2d95 /OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' into bulletsim4 (diff) | |
| download | opensim-SC-3aa83738e2a845d05bb25ab81634d0540971c0bf.zip opensim-SC-3aa83738e2a845d05bb25ab81634d0540971c0bf.tar.gz opensim-SC-3aa83738e2a845d05bb25ab81634d0540971c0bf.tar.bz2 opensim-SC-3aa83738e2a845d05bb25ab81634d0540971c0bf.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs index 92ace66..3630ca8 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs | |||
| @@ -87,8 +87,8 @@ public class BSActorHover : BSActor | |||
| 87 | // The object's physical representation is being rebuilt so pick up any physical dependencies (constraints, ...). | 87 | // The object's physical representation is being rebuilt so pick up any physical dependencies (constraints, ...). |
| 88 | // Register a prestep action to restore physical requirements before the next simulation step. | 88 | // Register a prestep action to restore physical requirements before the next simulation step. |
| 89 | // Called at taint-time. | 89 | // Called at taint-time. |
| 90 | // BSActor.RemoveBodyDependencies() | 90 | // BSActor.RemoveDependencies() |
| 91 | public override void RemoveBodyDependencies() | 91 | public override void RemoveDependencies() |
| 92 | { | 92 | { |
| 93 | // Nothing to do for the hoverer since it is all software at pre-step action time. | 93 | // Nothing to do for the hoverer since it is all software at pre-step action time. |
| 94 | } | 94 | } |