diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 5a10b2f57b..a7e529adff 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -11705,8 +11705,8 @@ render_pass="bump">
id="684"
group="0"
sex="female"
- name="Breast_Physics_Side_Controller"
- label="Breast Physics Side Controller"
+ name="Breast_Physics_InOut_Controller"
+ label="Breast Physics InOut Controller"
wearable="shape"
edit_group="shape_torso"
edit_group_order="8"
@@ -11775,7 +11775,7 @@ render_pass="bump">
name="Breast_Physics_Mass"
label="Breast Physics Mass"
wearable="physics"
- edit_group="physics_breasts"
+ edit_group="physics_breasts_updown"
value_default=".1"
value_min=".1"
value_max="1">
@@ -11788,7 +11788,7 @@ render_pass="bump">
name="Breast_Physics_Smoothing"
label="Breast Physics Smoothing"
wearable="physics"
- edit_group="physics_breasts"
+ edit_group="physics_breasts_updown"
value_default="2"
value_min="1"
value_max="10">
@@ -11801,111 +11801,60 @@ render_pass="bump">
name="Breast_Physics_Gravity"
label="Breast Physics Gravity"
wearable="physics"
- edit_group="physics_breasts"
+ edit_group="physics_breasts_updown"
value_default="0"
value_min="0"
value_max=".1">
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ value_max=".5">
@@ -11946,7 +11948,7 @@ render_pass="bump">
name="Belly_Physics_Mass"
label="Belly Physics Mass"
wearable="physics"
- edit_group="physics_belly"
+ edit_group="physics_belly_updown"
value_default=".1"
value_min=".1"
value_max="1">
@@ -11958,7 +11960,7 @@ render_pass="bump">
name="Belly_Physics_Smoothing"
label="Belly Physics Smoothing"
wearable="physics"
- edit_group="physics_belly"
+ edit_group="physics_belly_updown"
value_default="2"
value_min="1"
value_max="10">
@@ -11970,72 +11972,72 @@ render_pass="bump">
name="Belly_Physics_Gravity"
label="Belly Physics Gravity"
wearable="physics"
- edit_group="physics_belly"
+ edit_group="physics_belly_updown"
value_default="0"
value_min="0"
value_max=".1">
-
+
+
+
-
-
-
name="Butt_Physics_Mass"
label="Butt Physics Mass"
wearable="physics"
- edit_group="physics_butt"
+ edit_group="physics_butt_updown"
value_default=".1"
value_min=".1"
value_max="1">
@@ -12055,7 +12057,7 @@ render_pass="bump">
name="Butt_Physics_Smoothing"
label="Butt Physics Smoothing"
wearable="physics"
- edit_group="physics_butt"
+ edit_group="physics_butt_updown"
value_default="2"
value_min="1"
value_max="10">
@@ -12067,132 +12069,134 @@ render_pass="bump">
name="Butt_Physics_Gravity"
label="Butt Physics Gravity"
wearable="physics"
- edit_group="physics_butt"
+ edit_group="physics_butt_updown"
value_default="0"
value_min="0"
value_max=".1">
-
+ value_max="10">
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp
index d04604a644..a7ee5a03b7 100644
--- a/indra/newview/llpaneleditwearable.cpp
+++ b/indra/newview/llpaneleditwearable.cpp
@@ -95,9 +95,11 @@ enum ESubpart {
SUBPART_SKIRT,
SUBPART_ALPHA,
SUBPART_TATTOO,
- SUBPART_PHYSICS_BREASTS,
- SUBPART_PHYSICS_BELLY,
- SUBPART_PHYSICS_BUTT
+ SUBPART_PHYSICS_BREASTS_UPDOWN,
+ SUBPART_PHYSICS_BREASTS_INOUT,
+ SUBPART_PHYSICS_BELLY_UPDOWN,
+ SUBPART_PHYSICS_BUTT_UPDOWN,
+ SUBPART_PHYSICS_BUTT_LEFTRIGHT
};
using namespace LLVOAvatarDefines;
@@ -236,7 +238,7 @@ LLEditWearableDictionary::Wearables::Wearables()
addEntry(LLWearableType::WT_SKIRT, new WearableEntry(LLWearableType::WT_SKIRT,"edit_skirt_title","skirt_desc_text",1,1,1, TEX_SKIRT, TEX_SKIRT, SUBPART_SKIRT));
addEntry(LLWearableType::WT_ALPHA, new WearableEntry(LLWearableType::WT_ALPHA,"edit_alpha_title","alpha_desc_text",0,5,1, TEX_LOWER_ALPHA, TEX_UPPER_ALPHA, TEX_HEAD_ALPHA, TEX_EYES_ALPHA, TEX_HAIR_ALPHA, SUBPART_ALPHA));
addEntry(LLWearableType::WT_TATTOO, new WearableEntry(LLWearableType::WT_TATTOO,"edit_tattoo_title","tattoo_desc_text",1,3,1, TEX_HEAD_TATTOO, TEX_LOWER_TATTOO, TEX_UPPER_TATTOO, TEX_HEAD_TATTOO, SUBPART_TATTOO));
- addEntry(LLWearableType::WT_PHYSICS, new WearableEntry(LLWearableType::WT_PHYSICS,"edit_physics_title","physics_desc_text",0,0,3, SUBPART_PHYSICS_BREASTS, SUBPART_PHYSICS_BELLY, SUBPART_PHYSICS_BUTT));
+ addEntry(LLWearableType::WT_PHYSICS, new WearableEntry(LLWearableType::WT_PHYSICS,"edit_physics_title","physics_desc_text",0,0,5, SUBPART_PHYSICS_BREASTS_UPDOWN, SUBPART_PHYSICS_BREASTS_INOUT, SUBPART_PHYSICS_BELLY_UPDOWN, SUBPART_PHYSICS_BUTT_UPDOWN, SUBPART_PHYSICS_BUTT_LEFTRIGHT));
}
LLEditWearableDictionary::WearableEntry::WearableEntry(LLWearableType::EType type,
@@ -307,9 +309,11 @@ LLEditWearableDictionary::Subparts::Subparts()
addEntry(SUBPART_UNDERPANTS, new SubpartEntry(SUBPART_UNDERPANTS, "mPelvis", "underpants", "underpants_main_param_list", "underpants_main_tab", LLVector3d(0.f, 0.f, -0.5f), LLVector3d(-1.6f, 0.15f, -0.5f),SEX_BOTH));
addEntry(SUBPART_ALPHA, new SubpartEntry(SUBPART_ALPHA, "mPelvis", "alpha", "alpha_main_param_list", "alpha_main_tab", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f),SEX_BOTH));
addEntry(SUBPART_TATTOO, new SubpartEntry(SUBPART_TATTOO, "mPelvis", "tattoo", "tattoo_main_param_list", "tattoo_main_tab", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f),SEX_BOTH));
- addEntry(SUBPART_PHYSICS_BREASTS, new SubpartEntry(SUBPART_PHYSICS_BREASTS, "mTorso", "physics_breasts", "physics_breasts_param_list", "physics_breasts_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_FEMALE));
- addEntry(SUBPART_PHYSICS_BELLY, new SubpartEntry(SUBPART_PHYSICS_BELLY, "mTorso", "physics_belly", "physics_belly_param_list", "physics_belly_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
- addEntry(SUBPART_PHYSICS_BUTT, new SubpartEntry(SUBPART_PHYSICS_BUTT, "mTorso", "physics_butt", "physics_butt_param_list", "physics_butt_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
+ addEntry(SUBPART_PHYSICS_BREASTS_UPDOWN, new SubpartEntry(SUBPART_PHYSICS_BREASTS_UPDOWN, "mTorso", "physics_breasts_updown", "physics_breasts_updown_param_list", "physics_breasts_updown_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_FEMALE));
+ addEntry(SUBPART_PHYSICS_BREASTS_INOUT, new SubpartEntry(SUBPART_PHYSICS_BREASTS_INOUT, "mTorso", "physics_breasts_inout", "physics_breasts_inout_param_list", "physics_breasts_inout_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_FEMALE));
+ addEntry(SUBPART_PHYSICS_BELLY_UPDOWN, new SubpartEntry(SUBPART_PHYSICS_BELLY_UPDOWN, "mTorso", "physics_belly_updown", "physics_belly_updown_param_list", "physics_belly_updown_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
+ addEntry(SUBPART_PHYSICS_BUTT_UPDOWN, new SubpartEntry(SUBPART_PHYSICS_BUTT_UPDOWN, "mTorso", "physics_butt_updown", "physics_butt_updown_param_list", "physics_butt_updown_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
+ addEntry(SUBPART_PHYSICS_BUTT_LEFTRIGHT, new SubpartEntry(SUBPART_PHYSICS_BUTT_LEFTRIGHT, "mTorso", "physics_butt_leftright", "physics_butt_leftright_param_list", "physics_butt_leftright_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
}
LLEditWearableDictionary::SubpartEntry::SubpartEntry(ESubpart part,
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;
diff --git a/indra/newview/skins/default/xui/en/panel_edit_physics.xml b/indra/newview/skins/default/xui/en/panel_edit_physics.xml
index 6e89a8cb1a..94cb68abbc 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_physics.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_physics.xml
@@ -22,9 +22,8 @@
top_pad="10"
width="313">
+ name="physics_breasts_updown_tab"
+ title="Breasts Bounce">
+
+
+
@@ -50,12 +63,12 @@
fit_panel="false"
min_height="50"
name="physics_belly_tab"
- title="Belly">
+ title="Belly Bounce">
@@ -65,12 +78,27 @@
fit_panel="false"
min_height="50"
name="physics_butt_tab"
- title="Butt">
+ title="Butt Bounce">
+
+
+
+
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index e12f7c679e..88b5eb7e23 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2501,7 +2501,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
Bow Legged
Breast Buoyancy
-Breast Cleavage
+Breast Cleavage
Breast Size
Bridge Width
Broad
@@ -2511,42 +2511,47 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
Bulbous
Bulbous Nose
-Breast Mass
-Breast Smoothing
-Breast Gravity
-Breast Side Spring
-Breast Side Gain
-Breast Side Damping
-Breast Side Drag
-Breast Side Max Speed
-Breast UpDown Spring
-Breast UpDown Gain
-Breast UpDown Damping
-Breast UpDown Drag
-Breast UpDown Max Speed
+Mass
+Smoothing
+Gravity
-Belly Mass
-Belly Smoothing
-Belly Gravity
-Belly UpDown Spring
-Belly UpDown Gain
-Belly UpDown Damping
-Belly UpDown Drag
-Belly UpDown Max Speed
+Max Effect
+Spring
+Gain
+Damping
+Drag
+
+Max Effect
+Spring
+Gain
+Damping
+Drag
+
+Mass
+Smoothing
+Gravity
+
+Max Effect
+Spring
+Gain
+Damping
+Drag
Butt Mass
Butt Smoothing
Butt Gravity
-Butt UpDown Spring
-Butt UpDown Gain
-Butt UpDown Damping
-Butt UpDown Drag
-Butt UpDown Max Speed
-Butt LeftRight Spring
-Butt LeftRight Gain
-Butt LeftRight Damping
-Butt LeftRight Drag
-Butt LeftRight Max Speed
+
+Max Effect
+Spring
+Gain
+Damping
+Drag
+
+Max Effect
+Spring
+Gain
+Damping
+Drag
Bushy Eyebrows
Bushy Hair