summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--indra/newview/character/avatar_lad.xml24
-rw-r--r--indra/newview/llphysicsmotion.cpp12
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml12
3 files changed, 24 insertions, 24 deletions
diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index c63701cea5..35f88a7a5c 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -11870,8 +11870,8 @@ render_pass="bump">
id="10004"
group="0"
sex="female"
- name="Breast_Physics_UpDown_Max_Velocity"
- label="Breast Physics UpDown Max Speed"
+ name="Breast_Physics_UpDown_Max_Effect"
+ label="Breast Physics UpDown Max Effect"
wearable="physics"
edit_group="physics_breasts_updown"
value_default="0"
@@ -11925,8 +11925,8 @@ render_pass="bump">
id="10008"
group="0"
sex="female"
- name="Breast_Physics_InOut_Max_Velocity"
- label="Breast Physics InOut Max Speed"
+ name="Breast_Physics_InOut_Max_Effect"
+ label="Breast Physics InOut Max Effect"
wearable="physics"
edit_group="physics_breasts_inout"
value_default="0"
@@ -12025,8 +12025,8 @@ render_pass="bump">
<param
id="10016"
group="0"
- name="Belly_Physics_UpDown_Max_Velocity"
- label="Belly Physics UpDown Max Speed"
+ name="Belly_Physics_UpDown_Max_Effect"
+ label="Belly Physics UpDown Max Effect"
wearable="physics"
edit_group="physics_belly_updown"
value_default="0"
@@ -12123,8 +12123,8 @@ render_pass="bump">
<param
id="10024"
group="0"
- name="Butt_Physics_UpDown_Max_Velocity"
- label="Butt Physics UpDown Max Speed"
+ name="Butt_Physics_UpDown_Max_Effect"
+ label="Butt Physics UpDown Max Effect"
wearable="physics"
edit_group="physics_butt_updown"
value_default="0"
@@ -12172,8 +12172,8 @@ render_pass="bump">
<param
id="10028"
group="0"
- name="Butt_Physics_LeftRight_Max_Velocity"
- label="Butt Physics LeftRight Max Speed"
+ name="Butt_Physics_LeftRight_Max_Effect"
+ label="Butt Physics LeftRight Max Effect"
wearable="physics"
edit_group="physics_butt_leftright"
value_default="0"
@@ -12221,8 +12221,8 @@ render_pass="bump">
<param
id="10032"
group="0"
- name="Breast_Physics_LeftRight_Max_Velocity"
- label="Breast Physics LeftRight Max Speed"
+ name="Breast_Physics_LeftRight_Max_Effect"
+ label="Breast Physics LeftRight Max Effect"
wearable="physics"
edit_group="physics_breasts_leftright"
value_default="0"
diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp
index 43044e20ea..7b5ae0199a 100644
--- a/indra/newview/llphysicsmotion.cpp
+++ b/indra/newview/llphysicsmotion.cpp
@@ -246,7 +246,7 @@ LLMotion::LLMotionInitStatus LLPhysicsMotionController::onInitialize(LLCharacter
controller["Gravity"] = "Breast_Physics_Gravity";
controller["Drag"] = "Breast_Physics_Drag";
controller["Damping"] = "Breast_Physics_InOut_Damping";
- controller["MaxSpeed"] = "Breast_Physics_InOut_Max_Velocity";
+ controller["MaxSpeed"] = "Breast_Physics_InOut_Max_Effect";
controller["Spring"] = "Breast_Physics_InOut_Spring";
controller["Gain"] = "Breast_Physics_InOut_Gain";
LLPhysicsMotion *motion = new LLPhysicsMotion("Breast_Physics_InOut_Controller",
@@ -271,7 +271,7 @@ LLMotion::LLMotionInitStatus LLPhysicsMotionController::onInitialize(LLCharacter
controller["Gravity"] = "Breast_Physics_Gravity";
controller["Drag"] = "Breast_Physics_Drag";
controller["Damping"] = "Breast_Physics_UpDown_Damping";
- controller["MaxSpeed"] = "Breast_Physics_UpDown_Max_Velocity";
+ controller["MaxSpeed"] = "Breast_Physics_UpDown_Max_Effect";
controller["Spring"] = "Breast_Physics_UpDown_Spring";
controller["Gain"] = "Breast_Physics_UpDown_Gain";
LLPhysicsMotion *motion = new LLPhysicsMotion("Breast_Physics_UpDown_Controller",
@@ -296,7 +296,7 @@ LLMotion::LLMotionInitStatus LLPhysicsMotionController::onInitialize(LLCharacter
controller["Gravity"] = "Breast_Physics_Gravity";
controller["Drag"] = "Breast_Physics_Drag";
controller["Damping"] = "Breast_Physics_LeftRight_Damping";
- controller["MaxSpeed"] = "Breast_Physics_LeftRight_Max_Velocity";
+ controller["MaxSpeed"] = "Breast_Physics_LeftRight_Max_Effect";
controller["Spring"] = "Breast_Physics_LeftRight_Spring";
controller["Gain"] = "Breast_Physics_LeftRight_Gain";
LLPhysicsMotion *motion = new LLPhysicsMotion("Breast_Physics_LeftRight_Controller",
@@ -321,7 +321,7 @@ LLMotion::LLMotionInitStatus LLPhysicsMotionController::onInitialize(LLCharacter
controller["Gravity"] = "Butt_Physics_Gravity";
controller["Drag"] = "Butt_Physics_Drag";
controller["Damping"] = "Butt_Physics_UpDown_Damping";
- controller["MaxSpeed"] = "Butt_Physics_UpDown_Max_Velocity";
+ controller["MaxSpeed"] = "Butt_Physics_UpDown_Max_Effect";
controller["Spring"] = "Butt_Physics_UpDown_Spring";
controller["Gain"] = "Butt_Physics_UpDown_Gain";
LLPhysicsMotion *motion = new LLPhysicsMotion("Butt_Physics_UpDown_Controller",
@@ -346,7 +346,7 @@ LLMotion::LLMotionInitStatus LLPhysicsMotionController::onInitialize(LLCharacter
controller["Gravity"] = "Butt_Physics_Gravity";
controller["Drag"] = "Butt_Physics_Drag";
controller["Damping"] = "Butt_Physics_LeftRight_Damping";
- controller["MaxSpeed"] = "Butt_Physics_LeftRight_Max_Velocity";
+ controller["MaxSpeed"] = "Butt_Physics_LeftRight_Max_Effect";
controller["Spring"] = "Butt_Physics_LeftRight_Spring";
controller["Gain"] = "Butt_Physics_LeftRight_Gain";
LLPhysicsMotion *motion = new LLPhysicsMotion("Butt_Physics_LeftRight_Controller",
@@ -371,7 +371,7 @@ LLMotion::LLMotionInitStatus LLPhysicsMotionController::onInitialize(LLCharacter
controller["Gravity"] = "Belly_Physics_Gravity";
controller["Drag"] = "Belly_Physics_Drag";
controller["Damping"] = "Belly_Physics_UpDown_Damping";
- controller["MaxSpeed"] = "Belly_Physics_UpDown_Max_Velocity";
+ controller["MaxSpeed"] = "Belly_Physics_UpDown_Max_Effect";
controller["Spring"] = "Belly_Physics_UpDown_Spring";
controller["Gain"] = "Belly_Physics_UpDown_Gain";
LLPhysicsMotion *motion = new LLPhysicsMotion("Belly_Physics_UpDown_Controller",
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index b4c3ab3817..548d49308f 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2516,17 +2516,17 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Breast Physics Gravity">Breast Gravity</string>
<string name="Breast Physics Drag">Breast Drag</string>
-<string name="Breast Physics InOut Max Speed">Max Effect</string>
+<string name="Breast Physics InOut Max Effect">Max Effect</string>
<string name="Breast Physics InOut Spring">Spring</string>
<string name="Breast Physics InOut Gain">Gain</string>
<string name="Breast Physics InOut Damping">Damping</string>
-<string name="Breast Physics UpDown Max Speed">Max Effect</string>
+<string name="Breast Physics UpDown Max Effect">Max Effect</string>
<string name="Breast Physics UpDown Spring">Spring</string>
<string name="Breast Physics UpDown Gain">Gain</string>
<string name="Breast Physics UpDown Damping">Damping</string>
-<string name="Breast Physics LeftRight Max Speed">Max Effect</string>
+<string name="Breast Physics LeftRight Max Effect">Max Effect</string>
<string name="Breast Physics LeftRight Spring">Spring</string>
<string name="Breast Physics LeftRight Gain">Gain</string>
<string name="Breast Physics LeftRight Damping">Damping</string>
@@ -2536,7 +2536,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Belly Physics Gravity">Belly Gravity</string>
<string name="Belly Physics Drag">Belly Drag</string>
-<string name="Belly Physics UpDown Max Speed">Max Effect</string>
+<string name="Belly Physics UpDown Max Effect">Max Effect</string>
<string name="Belly Physics UpDown Spring">Spring</string>
<string name="Belly Physics UpDown Gain">Gain</string>
<string name="Belly Physics UpDown Damping">Damping</string>
@@ -2546,12 +2546,12 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Butt Physics Gravity">Butt Gravity</string>
<string name="Butt Physics Drag">Butt Drag</string>
-<string name="Butt Physics UpDown Max Speed">Max Effect</string>
+<string name="Butt Physics UpDown Max Effect">Max Effect</string>
<string name="Butt Physics UpDown Spring">Spring</string>
<string name="Butt Physics UpDown Gain">Gain</string>
<string name="Butt Physics UpDown Damping">Damping</string>
-<string name="Butt Physics LeftRight Max Speed">Max Effect</string>
+<string name="Butt Physics LeftRight Max Effect">Max Effect</string>
<string name="Butt Physics LeftRight Spring">Spring</string>
<string name="Butt Physics LeftRight Gain">Gain</string>
<string name="Butt Physics LeftRight Damping">Damping</string>
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-04 06:44:33 +0000