diff options
| author | BlueWall | 2013-03-05 15:30:54 -0500 |
|---|---|---|
| committer | BlueWall | 2013-03-05 15:30:54 -0500 |
| commit | f676408e2a45101bcab0a33f598ea9047f02036a (patch) | |
| tree | eb34ea8fb0a783ee466873462285eba629ab6405 /OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | |
| parent | Add method to remove JsonRpc Handlers from the server (diff) | |
| parent | * Add a Max Payload size property to the Websocket Server Handler. If you ... (diff) | |
| download | opensim-SC-f676408e2a45101bcab0a33f598ea9047f02036a.zip opensim-SC-f676408e2a45101bcab0a33f598ea9047f02036a.tar.gz opensim-SC-f676408e2a45101bcab0a33f598ea9047f02036a.tar.bz2 opensim-SC-f676408e2a45101bcab0a33f598ea9047f02036a.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs index e6933f9..235cefc 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | |||
| @@ -961,13 +961,13 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
| 961 | // ================================================================== | 961 | // ================================================================== |
| 962 | // Clamp high or low velocities | 962 | // Clamp high or low velocities |
| 963 | float newVelocityLengthSq = VehicleVelocity.LengthSquared(); | 963 | float newVelocityLengthSq = VehicleVelocity.LengthSquared(); |
| 964 | if (newVelocityLengthSq > BSParam.VehicleMaxLinearVelocitySq) | 964 | if (newVelocityLengthSq > BSParam.VehicleMaxLinearVelocitySquared) |
| 965 | { | 965 | { |
| 966 | Vector3 origVelW = VehicleVelocity; // DEBUG DEBUG | 966 | Vector3 origVelW = VehicleVelocity; // DEBUG DEBUG |
| 967 | VehicleVelocity /= VehicleVelocity.Length(); | 967 | VehicleVelocity /= VehicleVelocity.Length(); |
| 968 | VehicleVelocity *= BSParam.VehicleMaxLinearVelocity; | 968 | VehicleVelocity *= BSParam.VehicleMaxLinearVelocity; |
| 969 | VDetailLog("{0}, MoveLinear,clampMax,origVelW={1},lenSq={2},maxVelSq={3},,newVelW={4}", | 969 | VDetailLog("{0}, MoveLinear,clampMax,origVelW={1},lenSq={2},maxVelSq={3},,newVelW={4}", |
| 970 | Prim.LocalID, origVelW, newVelocityLengthSq, BSParam.VehicleMaxLinearVelocitySq, VehicleVelocity); | 970 | Prim.LocalID, origVelW, newVelocityLengthSq, BSParam.VehicleMaxLinearVelocitySquared, VehicleVelocity); |
| 971 | } | 971 | } |
| 972 | else if (newVelocityLengthSq < 0.001f) | 972 | else if (newVelocityLengthSq < 0.001f) |
| 973 | VehicleVelocity = Vector3.Zero; | 973 | VehicleVelocity = Vector3.Zero; |