diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index a7e529adff6b152e2ddfb83d51779e0bac83c449..4585ba658c04677e6b1e8b6b5ec331efad517f7c 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -11775,7 +11775,7 @@ render_pass="bump">
name="Breast_Physics_Mass"
label="Breast Physics Mass"
wearable="physics"
- edit_group="physics_breasts_updown"
+ edit_group="physics_advanced"
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_updown"
+ edit_group="physics_advanced"
value_default="2"
value_min="1"
value_max="10">
@@ -11801,7 +11801,7 @@ render_pass="bump">
name="Breast_Physics_Gravity"
label="Breast Physics Gravity"
wearable="physics"
- edit_group="physics_breasts_updown"
+ edit_group="physics_advanced"
value_default="0"
value_min="0"
value_max=".1">
@@ -11869,7 +11869,7 @@ render_pass="bump">
name="Breast_Physics_UpDown_Drag"
label="Breast Physics UpDown Drag"
wearable="physics"
- edit_group="physics_breasts_updown"
+ edit_group="physics_advanced"
value_default=".15"
value_min="0"
value_max=".5">
@@ -11935,7 +11935,7 @@ render_pass="bump">
name="Breast_Physics_InOut_Drag"
label="Breast Physics InOut Drag"
wearable="physics"
- edit_group="physics_breasts_inout"
+ edit_group="physics_advanced"
value_default=".15"
value_min="0"
value_max=".5">
@@ -11948,7 +11948,7 @@ render_pass="bump">
name="Belly_Physics_Mass"
label="Belly Physics Mass"
wearable="physics"
- edit_group="physics_belly_updown"
+ edit_group="physics_advanced"
value_default=".1"
value_min=".1"
value_max="1">
@@ -11960,7 +11960,7 @@ render_pass="bump">
name="Belly_Physics_Smoothing"
label="Belly Physics Smoothing"
wearable="physics"
- edit_group="physics_belly_updown"
+ edit_group="physics_advanced"
value_default="2"
value_min="1"
value_max="10">
@@ -11972,7 +11972,7 @@ render_pass="bump">
name="Belly_Physics_Gravity"
label="Belly Physics Gravity"
wearable="physics"
- edit_group="physics_belly_updown"
+ edit_group="physics_advanced"
value_default="0"
value_min="0"
value_max=".1">
@@ -12032,7 +12032,7 @@ render_pass="bump">
name="Belly_Physics_UpDown_Drag"
label="Belly Physics UpDown Drag"
wearable="physics"
- edit_group="physics_belly_updown"
+ edit_group="physics_advanced"
value_default=".15"
value_min="0"
value_max=".5">
@@ -12045,7 +12045,7 @@ render_pass="bump">
name="Butt_Physics_Mass"
label="Butt Physics Mass"
wearable="physics"
- edit_group="physics_butt_updown"
+ edit_group="physics_advanced"
value_default=".1"
value_min=".1"
value_max="1">
@@ -12057,7 +12057,7 @@ render_pass="bump">
name="Butt_Physics_Smoothing"
label="Butt Physics Smoothing"
wearable="physics"
- edit_group="physics_butt_updown"
+ edit_group="physics_advanced"
value_default="2"
value_min="1"
value_max="10">
@@ -12069,7 +12069,7 @@ render_pass="bump">
name="Butt_Physics_Gravity"
label="Butt Physics Gravity"
wearable="physics"
- edit_group="physics_butt_updown"
+ edit_group="physics_advanced"
value_default="0"
value_min="0"
value_max=".1">
@@ -12129,7 +12129,7 @@ render_pass="bump">
name="Butt_Physics_UpDown_Drag"
label="Butt Physics UpDown Drag"
wearable="physics"
- edit_group="physics_butt_updown"
+ edit_group="physics_advanced"
value_default=".15"
value_min="0"
value_max=".5">
@@ -12190,7 +12190,7 @@ render_pass="bump">
name="Butt_Physics_LeftRight_Drag"
label="Butt Physics LeftRight Drag"
wearable="physics"
- edit_group="physics_butt_leftright"
+ edit_group="physics_advanced"
value_default=".15"
value_min="0"
value_max=".5">
diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp
index a7ee5a03b743231507bf27150d31248230086180..4db9a154ea63a60827927ce5a7fcb5d7cdaaf120 100644
--- a/indra/newview/llpaneleditwearable.cpp
+++ b/indra/newview/llpaneleditwearable.cpp
@@ -99,7 +99,8 @@ enum ESubpart {
SUBPART_PHYSICS_BREASTS_INOUT,
SUBPART_PHYSICS_BELLY_UPDOWN,
SUBPART_PHYSICS_BUTT_UPDOWN,
- SUBPART_PHYSICS_BUTT_LEFTRIGHT
+ SUBPART_PHYSICS_BUTT_LEFTRIGHT,
+ SUBPART_PHYSICS_ADVANCED,
};
using namespace LLVOAvatarDefines;
@@ -238,7 +239,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,5, SUBPART_PHYSICS_BREASTS_UPDOWN, SUBPART_PHYSICS_BREASTS_INOUT, SUBPART_PHYSICS_BELLY_UPDOWN, SUBPART_PHYSICS_BUTT_UPDOWN, SUBPART_PHYSICS_BUTT_LEFTRIGHT));
+ addEntry(LLWearableType::WT_PHYSICS, new WearableEntry(LLWearableType::WT_PHYSICS,"edit_physics_title","physics_desc_text",0,0,6, SUBPART_PHYSICS_BREASTS_UPDOWN, SUBPART_PHYSICS_BREASTS_INOUT, SUBPART_PHYSICS_BELLY_UPDOWN, SUBPART_PHYSICS_BUTT_UPDOWN, SUBPART_PHYSICS_BUTT_LEFTRIGHT, SUBPART_PHYSICS_ADVANCED));
}
LLEditWearableDictionary::WearableEntry::WearableEntry(LLWearableType::EType type,
@@ -313,7 +314,8 @@ LLEditWearableDictionary::Subparts::Subparts()
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));
+ 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.f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
+ addEntry(SUBPART_PHYSICS_ADVANCED, new SubpartEntry(SUBPART_PHYSICS_ADVANCED, "mTorso", "physics_advanced", "physics_advanced_param_list", "physics_advanced_tab", LLVector3d(0.f, 0.f, 0.f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
}
LLEditWearableDictionary::SubpartEntry::SubpartEntry(ESubpart part,
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 94cb68abbccec713d69889adf96c6a334d8762e1..c6f974f4f1d30dbad1f34cb801a5833506052cd6 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_physics.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_physics.xml
@@ -8,98 +8,114 @@
name="edit_physics_panel"
top_pad="10"
width="333" >
- <panel
+ <panel
border="false"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="all"
- height="300"
+ height="388"
+ label=""
layout="topleft"
- left="10"
+ left="10"
name="accordion_panel"
- top_pad="10"
+ top_pad="0"
width="313">
<accordion
follows="all"
height ="388"
layout="topleft"
left="0"
- single_expansion="true"
+ single_expansion="true"
+ fit_parent="true"
name="physics_accordion"
top="0"
width="313">
<accordion_tab
layout="topleft"
- fit_panel="false"
+ fit_panel="false"
min_height="50"
name="physics_breasts_updown_tab"
title="Breasts Bounce">
<scrolling_panel_list
follows="all"
- layout="topleft"
- left="0"
+ layout="topleft"
+ left="10"
name="physics_breasts_updown_param_list"
- top="0"
+ top="10"
width="303" />
</accordion_tab>
<accordion_tab
layout="topleft"
- fit_panel="false"
+ fit_panel="false"
min_height="50"
name="physics_breasts_inout_tab"
title="Breasts Cleavage">
<scrolling_panel_list
follows="all"
- layout="topleft"
+ layout="topleft"
left="0"
name="physics_breasts_inout_param_list"
- top="0"
+ top_pad="50"
width="303" />
</accordion_tab>
<accordion_tab
layout="topleft"
- fit_panel="false"
+ fit_panel="false"
min_height="50"
name="physics_belly_tab"
title="Belly Bounce">
<scrolling_panel_list
follows="all"
- layout="topleft"
+ layout="topleft"
left="0"
name="physics_belly_updown_param_list"
- top="0"
+ top_pad="40"
width="303" />
</accordion_tab>
<accordion_tab
layout="topleft"
- fit_panel="false"
+ fit_panel="false"
min_height="50"
name="physics_butt_tab"
title="Butt Bounce">
<scrolling_panel_list
follows="all"
- layout="topleft"
+ layout="topleft"
left="0"
name="physics_butt_updown_param_list"
- top="0"
+ top_pad="30"
width="303" />
</accordion_tab>
<accordion_tab
layout="topleft"
- fit_panel="false"
+ fit_panel="false"
min_height="50"
name="physics_butt_leftright_tab"
title="Butt Sway">
<scrolling_panel_list
follows="all"
- layout="topleft"
+ layout="topleft"
left="0"
name="physics_butt_leftright_param_list"
- top="0"
+ top_pad="20"
+ width="303" />
+ </accordion_tab>
+ <accordion_tab
+ layout="topleft"
+ fit_panel="false"
+ min_height="50"
+ name="physics_advanced_tab"
+ title="Advanced Parameters">
+ <scrolling_panel_list
+ follows="all"
+ layout="topleft"
+ left="0"
+ name="physics_advanced_param_list"
+ top_pad="10"
width="303" />
</accordion_tab>
</accordion>
diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml
index 177a2fe9f0a095352e86c726826ab7c6e6fea2a9..1351f75623e96293c4e3027cc7c972dfb010aa44 100644
--- a/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml
+++ b/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml
@@ -3,21 +3,22 @@
layout="topleft"
left="0"
name="LLScrollingPanelParamBase"
- height="20"
+ height="16"
width="290">
<slider
can_edit_text="true"
decimal_digits="0"
enabled="false"
- height="16"
+ height="12"
increment="1"
initial_value="0"
label="[DESC]"
+ label_width="125"
layout="bottom|left"
- left="6"
+ left="16"
max_val="100"
name="param slider"
- bottom="1"
- width="274"
- slider_label.font.style="BOLD" />
+ bottom="0"
+ width="264"
+ />
</panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 88b5eb7e23220955db110491381971b49edc679a..6f03606869d4014ddb0650729f90429610b77961 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2511,31 +2511,31 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Bulbous">Bulbous</string>
<string name="Bulbous Nose">Bulbous Nose</string>
-<string name="Breast Physics Mass">Mass</string>
-<string name="Breast Physics Smoothing">Smoothing</string>
-<string name="Breast Physics Gravity">Gravity</string>
+<string name="Breast Physics Mass">Breast Mass</string>
+<string name="Breast Physics Smoothing">Breast Smoothing</string>
+<string name="Breast Physics Gravity">Breast Gravity</string>
<string name="Breast Physics InOut Max Speed">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 InOut Drag">Drag</string>
+<string name="Breast Physics InOut Drag">Breast Cleavage Drag</string>
<string name="Breast Physics UpDown Max Speed">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 UpDown Drag">Drag</string>
+<string name="Breast Physics UpDown Drag">Breast Bounce Drag</string>
-<string name="Belly Physics Mass">Mass</string>
-<string name="Belly Physics Smoothing">Smoothing</string>
-<string name="Belly Physics Gravity">Gravity</string>
+<string name="Belly Physics Mass">Belly Mass</string>
+<string name="Belly Physics Smoothing">Belly Smoothing</string>
+<string name="Belly Physics Gravity">Belly Gravity</string>
<string name="Belly Physics UpDown Max Speed">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>
-<string name="Belly Physics UpDown Drag">Drag</string>
+<string name="Belly Physics UpDown Drag">Belly Bounce Drag</string>
<string name="Butt Physics Mass">Butt Mass</string>
<string name="Butt Physics Smoothing">Butt Smoothing</string>
@@ -2545,13 +2545,13 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<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 UpDown Drag">Drag</string>
+<string name="Butt Physics UpDown Drag">Butt Bounce Drag</string>
<string name="Butt Physics LeftRight Max Speed">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>
-<string name="Butt Physics LeftRight Drag">Drag</string>
+<string name="Butt Physics LeftRight Drag">Butt Sway Drag</string>
<string name="Bushy Eyebrows">Bushy Eyebrows</string>
<string name="Bushy Hair">Bushy Hair</string>