diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index e37ff1833d834deb720d10c3fa9393b3e11edca9..9609e58918ef5c9d1da3b6ede40f0224378e67ce 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -9203,8 +9203,8 @@ render_pass="bump">
id="1081"
group="0"
sex="female"
- name="Breast_Physics_Side_Range"
- label="Breast Physics Side Range"
+ name="Breast_Physics_Side_Max_Velocity"
+ label="Breast Physics Side Max Speed"
wearable="physics"
edit_group="physics"
label_min="Less"
@@ -9294,8 +9294,8 @@ render_pass="bump">
id="1086"
group="0"
sex="female"
- name="Breast_Physics_UpDown_Range"
- label="Breast Physics UpDown Range"
+ name="Breast_Physics_UpDown_Max_Velocity"
+ label="Breast Physics UpDown Max Speed"
wearable="physics"
edit_group="physics"
label_min="Less"
@@ -9338,7 +9338,7 @@ render_pass="bump">
label="Breast Cleavage"
wearable="shape"
edit_group="shape_torso"
- edit_group_order="7"
+ edit_group_order="8"
label_min="Less"
label_max="More"
value_default="10"
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index cd6f87f615d7b60a5cb2308986a010fc32a2dcd6..e8733bf3e43293bbf899337a5c79eef95f57906d 100644
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@@ -176,11 +176,6 @@ void LLSidepanelAppearance::onOpen(const LLSD& key)
{
showWearableEditPanel();
}
- else if (type == "edit_physics")
- {
- showPhysicsEditPanel();
- }
-
}
mOpened = true;
@@ -312,11 +307,6 @@ void LLSidepanelAppearance::showWearableEditPanel(LLWearable *wearable /* = NULL
toggleWearableEditPanel(TRUE, wearable, disable_camera_switch);
}
-void LLSidepanelAppearance::showPhysicsEditPanel(LLWearable *wearable /* = NULL*/)
-{
- showWearableEditPanel(wearable, TRUE);
-}
-
void LLSidepanelAppearance::toggleMyOutfitsPanel(BOOL visible)
{
if (!mPanelOutfitsInventory || mPanelOutfitsInventory->getVisible() == visible)
diff --git a/indra/newview/llsidepanelappearance.h b/indra/newview/llsidepanelappearance.h
index 70c8b7b797e083954143cf52754b1393bcfb47e7..1a200e255ced57c6618dee1641667877cf8bdef2 100644
--- a/indra/newview/llsidepanelappearance.h
+++ b/indra/newview/llsidepanelappearance.h
@@ -60,7 +60,6 @@ class LLSidepanelAppearance : public LLPanel
void showOutfitsInventoryPanel();
void showOutfitEditPanel();
void showWearableEditPanel(LLWearable *wearable = NULL, BOOL disable_camera_switch = FALSE);
- void showPhysicsEditPanel(LLWearable *wearable = NULL);
void setWearablesLoading(bool val);
void showDefaultSubpart();
void updateScrollingPanelList();
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index ac1af83959d946020754e2ee690affa2335c16ce..c9e47d89963e4679834b965aad815777e2a30e17 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -792,22 +792,6 @@ class LLBreastMotion :
return TRUE;
}
- /*
- FILE *fread = fopen("c:\\temp\\breast_data.txt","r");
- if (fread)
- {
- char dummy_str[255];
- fscanf(fread,"%s %f\n",dummy_str, &mBreastMassParam);
- fscanf(fread,"%s %f %f %f\n",dummy_str, &mBreastSpringParam[0],&mBreastSpringParam[1],&mBreastSpringParam[2]);
- fscanf(fread,"%s %f %f %f\n",dummy_str, &mBreastGainParam[0],&mBreastGainParam[1],&mBreastGainParam[2]);
- fscanf(fread,"%s %f %f %f\n",dummy_str, &mBreastDampingParam[0],&mBreastDampingParam[1],&mBreastDampingParam[2]);
- fscanf(fread,"%s %f %f %f\n",dummy_str, &mBreastMaxVelocityParam[0],&mBreastMaxVelocityParam[1],&mBreastMaxVelocityParam[2]);
- fscanf(fread,"%s %f %f %f\n",dummy_str, &mBreastDragParam[0], &mBreastDragParam[1], &mBreastDragParam[2]);
- fscanf(fread,"%s %d\n",dummy_str, &mBreastSmoothingParam);
- }
- fclose(fread);
- */
-
/* TEST:
1. Change outfits
2. FPS effect
@@ -824,13 +808,13 @@ class LLBreastMotion :
mBreastSpringParam[0] = mCharacter->getVisualParamWeight("Breast_Physics_Side_Spring");
mBreastGainParam[0] = mCharacter->getVisualParamWeight("Breast_Physics_Side_Gain");
mBreastDampingParam[0] = mCharacter->getVisualParamWeight("Breast_Physics_Side_Damping");
- mBreastMaxVelocityParam[0] = mCharacter->getVisualParamWeight("Breast_Physics_Side_Range");
+ mBreastMaxVelocityParam[0] = mCharacter->getVisualParamWeight("Breast_Physics_Side_Max_Velocity");
mBreastDragParam[0] = mCharacter->getVisualParamWeight("Breast_Physics_Side_Drag");
mBreastSpringParam[2] = mCharacter->getVisualParamWeight("Breast_Physics_UpDown_Spring");
mBreastGainParam[2] = mCharacter->getVisualParamWeight("Breast_Physics_UpDown_Gain");
mBreastDampingParam[2] = mCharacter->getVisualParamWeight("Breast_Physics_UpDown_Damping");
- mBreastMaxVelocityParam[2] = mCharacter->getVisualParamWeight("Breast_Physics_UpDown_Range");
+ mBreastMaxVelocityParam[2] = mCharacter->getVisualParamWeight("Breast_Physics_UpDown_Max_Velocity");
mBreastDragParam[2] = mCharacter->getVisualParamWeight("Breast_Physics_UpDown_Drag");
if (mCharacter->getSex() != SEX_FEMALE) return TRUE;
@@ -890,8 +874,13 @@ class LLBreastMotion :
LLVector3 new_local_pt = breast_current_local_pt + mBreastVelocity_local_vec*time_delta;
new_local_pt.clamp(mBreastParamsMin,mBreastParamsMax);
+
for (U32 i=0; i < 3; i++)
{
+ if (mBreastMaxVelocityParam[0] == 0)
+ {
+ new_local_pt[i] = breast_user_local_pt[i];
+ }
if (mBreastParamsDriven[i])
{
mCharacter->setVisualParamWeight(mBreastParamsDriven[i],
diff --git a/indra/newview/skins/default/xui/en/panel_edit_shape.xml b/indra/newview/skins/default/xui/en/panel_edit_shape.xml
index a7563d6f96b83dba0301e0d2cad530cec74a6f9c..d295f5fe4a7b496e57b5ce9f5bf02c6d3369bfdf 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_shape.xml
@@ -175,20 +175,6 @@
top="0"
width="303" />
</accordion_tab>
- <accordion_tab
- layout="topleft"
- min_height="150"
- name="shape_physics_tab"
- fit_panel="false"
- title="Physics">
- <scrolling_panel_list
- layout="topleft"
- follows="all"
- left="0"
- name="shape_physics_param_list"
- top="0"
- width="303" />
- </accordion_tab>
</accordion>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 532a4a2e6dd9112288e814c6fde4120fdfd54247..9fbb1ed04575690aec1ce113ff8c79e7c807f721 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2482,13 +2482,13 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Breast Physics Side Gain">Breast Side Gain</string>
<string name="Breast Physics Side Damping">Breast Side Damping</string>
<string name="Breast Physics Side Drag">Breast Side Drag</string>
-<string name="Breast Physics Side Range">Breast Side Max</string>
+<string name="Breast Physics Side Max Velocity">Breast Side Max</string>
<string name="Breast Physics UpDown Spring">Breast UpDown Spring</string>
<string name="Breast Physics UpDown Gain">Breast UpDown Gain</string>
<string name="Breast Physics UpDown Damping">Breast UpDown Damping</string>
<string name="Breast Physics UpDown Drag">Breast UpDown Drag</string>
-<string name="Breast Physics UpDown Range">Breast UpDown Range</string>
+<string name="Breast Physics UpDown Max Velocity">Breast UpDown Range</string>
<string name="Bushy Eyebrows">Bushy Eyebrows</string>
<string name="Bushy Hair">Bushy Hair</string>