diff options
author | Seraph Linden <none@none> | 2011-04-03 17:46:56 -0400 |
---|---|---|
committer | Seraph Linden <none@none> | 2011-04-03 17:46:56 -0400 |
commit | 05e23c39f731ed50663d3dd3f8fa442d95161241 (patch) | |
tree | 9a4e8facc5cd55c1f3b4f0480e04e5336de14e34 /indra | |
parent | 9c3b0ddeaf39bfbfe1bdfbbb614c8abe0b7c03a9 (diff) |
Minor fixes.
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llphysicsmotion.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp index 15797e5ab7..8f747af824 100644 --- a/indra/newview/llphysicsmotion.cpp +++ b/indra/newview/llphysicsmotion.cpp @@ -420,7 +420,7 @@ F32 LLPhysicsMotion::calculateAcceleration_local(const F32 velocity_local, const F32 time_delta)
{
// const F32 smoothing = getParamValue("Smoothing");
- static const F32 smoothing = 3.0f; // Removed smoothing param since it's probably not necessary
+ static const F32 smoothing = 3.0f; // Removed smoothing param since it's probably not necessary
const F32 acceleration_local = velocity_local - mVelocityJoint_local;
const F32 smoothed_acceleration_local =
@@ -584,7 +584,7 @@ BOOL LLPhysicsMotion::onUpdate(F32 time) // Calculate the new acceleration based on the net force.
// a = F/m
const F32 acceleration_new_local = force_net / behavior_mass;
- const F32 max_acceleration = 10.0f; // magic number, used to be customizable.
+ static const F32 max_acceleration = 10.0f; // magic number, used to be customizable.
F32 velocity_new_local = mVelocity_local + acceleration_new_local;
velocity_new_local = llclamp(velocity_new_local,
-max_acceleration, max_acceleration);
|