summaryrefslogtreecommitdiff
path: root/indra/newview/llphysicsmotion.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-03-30 23:17:58 -0400
committerLoren Shih <seraph@lindenlab.com>2011-03-30 23:17:58 -0400
commit1ceb29bdacb309ed374128feae879953c2e13820 (patch)
tree975bf663bf203f88231150a4a7780c07b884322d /indra/newview/llphysicsmotion.cpp
parent27f8b19040231c3cfb637d31c0a8a1de8b061e8c (diff)
Change in physics parameter names.
Split some physics parameters into separate accordions based on updown/leftright. Fixed a minor issue with physics edit tab height.
Diffstat (limited to 'indra/newview/llphysicsmotion.cpp')
-rw-r--r--indra/newview/llphysicsmotion.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp
index fd83f4d482..e6fe6fe924 100644
--- a/indra/newview/llphysicsmotion.cpp
+++ b/indra/newview/llphysicsmotion.cpp
@@ -244,12 +244,12 @@ LLMotion::LLMotionInitStatus LLPhysicsMotionController::onInitialize(LLCharacter
controller["Mass"] = "Breast_Physics_Mass";
controller["Smoothing"] = "Breast_Physics_Smoothing";
controller["Gravity"] = "Breast_Physics_Gravity";
- controller["Damping"] = "Breast_Physics_Side_Damping";
- controller["Drag"] = "Breast_Physics_Side_Drag";
- controller["MaxSpeed"] = "Breast_Physics_Side_Max_Velocity";
- controller["Spring"] = "Breast_Physics_Side_Spring";
- controller["Gain"] = "Breast_Physics_Side_Gain";
- LLPhysicsMotion *motion = new LLPhysicsMotion("Breast_Physics_Side_Controller",
+ controller["Damping"] = "Breast_Physics_InOut_Damping";
+ controller["Drag"] = "Breast_Physics_InOut_Drag";
+ controller["MaxSpeed"] = "Breast_Physics_InOut_Max_Velocity";
+ controller["Spring"] = "Breast_Physics_InOut_Spring";
+ controller["Gain"] = "Breast_Physics_InOut_Gain";
+ LLPhysicsMotion *motion = new LLPhysicsMotion("Breast_Physics_InOut_Controller",
"",
"mChest",
character,
@@ -630,7 +630,7 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
if ((pixel_area > area_for_this_setting) || is_self)
{
const F32 position_diff_local = llabs(mPositionLastUpdate_local-position_new_local_clamped);
- const F32 min_delta = (1.01f-lod_factor)*0.75f; // 75% is just an experimental magic number.
+ const F32 min_delta = (1.01f-lod_factor)*0.5f; // 75% is just an experimental magic number.
if (llabs(position_diff_local) > min_delta)
{
update_visuals = TRUE;