diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-08-26 16:05:43 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-08-26 16:05:43 -0400 |
| commit | 93404eca1a447f9412eb8ae2d5c4149ff9436dc7 (patch) | |
| tree | 9ac2bf9f4c2e8604c07939824dd80f8ac271780a /indra/newview | |
| parent | 0c21ba1e76eb189bdf43b7f2c81b3bf2b211578f (diff) | |
Changed parameter scale for max velocity so it's easier to turn off various physics.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/character/avatar_lad.xml | 8 | ||||
| -rw-r--r-- | indra/newview/llbreastmotion.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 6fa1111223..453ed1baf7 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -9209,9 +9209,9 @@ render_pass="bump"> edit_group="physics" label_min="Less" label_max="More" - value_default="5" + value_default="0" value_min="0" - value_max="1000" + value_max="10" camera_elevation=".3" camera_distance=".8"> <param_driver /> @@ -9300,9 +9300,9 @@ render_pass="bump"> edit_group="physics" label_min="Less" label_max="More" - value_default="5" + value_default="1" value_min="0" - value_max="1000" + value_max="10" camera_elevation=".3" camera_distance=".8"> <param_driver /> diff --git a/indra/newview/llbreastmotion.cpp b/indra/newview/llbreastmotion.cpp index 902c5af892..5bbab8a0a6 100644 --- a/indra/newview/llbreastmotion.cpp +++ b/indra/newview/llbreastmotion.cpp @@ -321,7 +321,7 @@ BOOL LLBreastMotion::onUpdate(F32 time, U8* joint_mask) LLVector3 acceleration_local_vec = force_net_local_vec / mBreastMassParam; mBreastVelocity_local_vec += acceleration_local_vec; - mBreastVelocity_local_vec.clamp(-mBreastMaxVelocityParam, mBreastMaxVelocityParam); + mBreastVelocity_local_vec.clamp(-mBreastMaxVelocityParam*100.0, mBreastMaxVelocityParam*100.0); LLVector3 new_local_pt = breast_current_local_pt + mBreastVelocity_local_vec*time_delta; new_local_pt.clamp(mBreastParamsMin,mBreastParamsMax); |