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/BSActorAvatarMove.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/BSActorAvatarMove.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs index bd5ee0b1..4e067b5 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs | |||
@@ -87,8 +87,8 @@ public class BSActorAvatarMove : 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 | } |
@@ -115,7 +115,7 @@ public class BSActorAvatarMove : BSActor | |||
115 | if (m_velocityMotor == null) | 115 | if (m_velocityMotor == null) |
116 | { | 116 | { |
117 | // Infinite decay and timescale values so motor only changes current to target values. | 117 | // Infinite decay and timescale values so motor only changes current to target values. |
118 | m_velocityMotor = new BSVMotor("BSCharacter.Velocity", | 118 | m_velocityMotor = new BSVMotor("BSCharacter.Velocity", |
119 | 0.2f, // time scale | 119 | 0.2f, // time scale |
120 | BSMotor.Infinite, // decay time scale | 120 | BSMotor.Infinite, // decay time scale |
121 | BSMotor.InfiniteVector, // friction timescale | 121 | BSMotor.InfiniteVector, // friction timescale |