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.

5 files changed, 213 insertions, 172 deletions

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,144 +11801,146 @@ 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">
 	 <param_driver />
     </param>
-    <param
+
+   <param
      id="1113"
      group="0"
      sex="female"
-     name="Breast_Physics_Side_Spring"
-     label="Breast Physics Side Spring"
+     name="Breast_Physics_UpDown_Max_Velocity"
+     label="Breast Physics UpDown Max Speed"
+     wearable="physics"
+     edit_group="physics_breasts_updown"
+     value_default="0"
+     value_min="0"
+     value_max="10">
+	 <param_driver />
+    </param>
+    <param
+     id="1114"
+     group="0"
+     sex="female"
+     name="Breast_Physics_UpDown_Spring"
+     label="Breast Physics UpDown Spring"
      wearable="physics"
-     edit_group="physics_breasts"
+     edit_group="physics_breasts_updown"
      value_default=".1"
      value_min="0"
      value_max="1">
 	 <param_driver />
     </param>
     <param
-     id="1114"
+     id="1115"
      group="0"
      sex="female"
-     name="Breast_Physics_Side_Gain"
-     label="Breast Physics Side Gain"
+     name="Breast_Physics_UpDown_Gain"
+     label="Breast Physics UpDown Gain"
      wearable="physics"
-     edit_group="physics_breasts"
+     edit_group="physics_breasts_updown"
      value_default="10"
      value_min="1"
      value_max="100">
 	 <param_driver />
     </param>
     <param
-     id="1115"
+     id="1116"
      group="0"
      sex="female"
-     name="Breast_Physics_Side_Damping"
-     label="Breast Physics Side Damping"
+     name="Breast_Physics_UpDown_Damping"
+     label="Breast Physics UpDown Damping"
      wearable="physics"
-     edit_group="physics_breasts"
+     edit_group="physics_breasts_updown"
      value_default=".05"
      value_min="0"
-     value_max=".1">
+     value_max=".1"
+     camera_elevation=".3"
+     camera_distance=".8">
 	 <param_driver />
     </param>
    <param
-     id="1116"
+     id="1117"
      group="0"
      sex="female"
-     name="Breast_Physics_Side_Drag"
-     label="Breast Physics Side Drag"
+     name="Breast_Physics_UpDown_Drag"
+     label="Breast Physics UpDown Drag"
      wearable="physics"
-     edit_group="physics_breasts"
+     edit_group="physics_breasts_updown"
      value_default=".15"
      value_min="0"
      value_max=".5">
 	 <param_driver />
     </param>
+
    <param
-     id="1117"
+     id="1118"
      group="0"
      sex="female"
-     name="Breast_Physics_Side_Max_Velocity"
-     label="Breast Physics Side Max Speed"
+     name="Breast_Physics_InOut_Max_Velocity"
+     label="Breast Physics InOut Max Speed"
      wearable="physics"
-     edit_group="physics_breasts"
+     edit_group="physics_breasts_inout"
      value_default="0"
      value_min="0"
      value_max="10">
 	 <param_driver />
     </param>
     <param
-     id="1118"
+     id="1119"
      group="0"
      sex="female"
-     name="Breast_Physics_UpDown_Spring"
-     label="Breast Physics UpDown Spring"
+     name="Breast_Physics_InOut_Spring"
+     label="Breast Physics InOut Spring"
      wearable="physics"
-     edit_group="physics_breasts"
+     edit_group="physics_breasts_inout"
      value_default=".1"
      value_min="0"
      value_max="1">
 	 <param_driver />
     </param>
     <param
-     id="1119"
+     id="1120"
      group="0"
      sex="female"
-     name="Breast_Physics_UpDown_Gain"
-     label="Breast Physics UpDown Gain"
+     name="Breast_Physics_InOut_Gain"
+     label="Breast Physics InOut Gain"
      wearable="physics"
-     edit_group="physics_breasts"
+     edit_group="physics_breasts_inout"
      value_default="10"
      value_min="1"
      value_max="100">
 	 <param_driver />
     </param>
     <param
-     id="1120"
+     id="1121"
      group="0"
      sex="female"
-     name="Breast_Physics_UpDown_Damping"
-     label="Breast Physics UpDown Damping"
+     name="Breast_Physics_InOut_Damping"
+     label="Breast Physics InOut Damping"
      wearable="physics"
-     edit_group="physics_breasts"
+     edit_group="physics_breasts_inout"
      value_default=".05"
      value_min="0"
-     value_max=".1"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max=".1">
 	 <param_driver />
     </param>
    <param
-     id="1121"
+     id="1122"
      group="0"
      sex="female"
-     name="Breast_Physics_UpDown_Drag"
-     label="Breast Physics UpDown Drag"
+     name="Breast_Physics_InOut_Drag"
+     label="Breast Physics InOut Drag"
      wearable="physics"
-     edit_group="physics_breasts"
+     edit_group="physics_breasts_inout"
      value_default=".15"
      value_min="0"
      value_max=".5">
 	 <param_driver />
     </param>
-   <param
-     id="1122"
-     group="0"
-     sex="female"
-     name="Breast_Physics_UpDown_Max_Velocity"
-     label="Breast Physics UpDown Max Speed"
-     wearable="physics"
-     edit_group="physics_breasts"
-     value_default="0"
-     value_min="0"
-     value_max="10">
-	 <param_driver />
-    </param>
 
     <param
      id="1130"
@@ -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">
 	 <param_driver />
     </param>
-    <param
+   <param
      id="1133"
      group="0"
+     name="Belly_Physics_UpDown_Max_Velocity"
+     label="Belly Physics UpDown Max Speed"
+     wearable="physics"
+     edit_group="physics_belly_updown"
+     value_default="0"
+     value_min="0"
+     value_max="10">
+	 <param_driver />
+    </param>
+    <param
+     id="1134"
+     group="0"
      name="Belly_Physics_UpDown_Spring"
      label="Belly Physics UpDown Spring"
      wearable="physics"
-     edit_group="physics_belly"
+     edit_group="physics_belly_updown"
      value_default=".1"
      value_min="0"
      value_max="1">
 	 <param_driver />
     </param>
     <param
-     id="1134"
+     id="1135"
      group="0"
      name="Belly_Physics_UpDown_Gain"
      label="Belly Physics UpDown Gain"
      wearable="physics"
-     edit_group="physics_belly"
+     edit_group="physics_belly_updown"
      value_default="10"
      value_min="1"
      value_max="100">
 	 <param_driver />
     </param>
     <param
-     id="1135"
+     id="1136"
      group="0"
      name="Belly_Physics_UpDown_Damping"
      label="Belly Physics UpDown Damping"
      wearable="physics"
-     edit_group="physics_belly"
+     edit_group="physics_belly_updown"
      value_default=".05"
      value_min="0"
      value_max=".1">
 	 <param_driver />
     </param>
    <param
-     id="1136"
+     id="1137"
      group="0"
      name="Belly_Physics_UpDown_Drag"
      label="Belly Physics UpDown Drag"
      wearable="physics"
-     edit_group="physics_belly"
+     edit_group="physics_belly_updown"
      value_default=".15"
      value_min="0"
      value_max=".5">
 	 <param_driver />
     </param>
-   <param
-     id="1137"
-     group="0"
-     name="Belly_Physics_UpDown_Max_Velocity"
-     label="Belly Physics UpDown Max Speed"
-     wearable="physics"
-     edit_group="physics_belly"
-     value_default="0"
-     value_min="0"
-     value_max="10">
-	 <param_driver />
-    </param>
 
     <param
      id="1140"
@@ -12043,7 +12045,7 @@ render_pass="bump">
      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">
 	 <param_driver />
     </param>
-    <param
+   <param
      id="1143"
      group="0"
+     name="Butt_Physics_UpDown_Max_Velocity"
+     label="Butt Physics UpDown Max Speed"
+     wearable="physics"
+     edit_group="physics_butt_updown"
+     value_default="0"
+     value_min="0"
+     value_max="10">
+	 <param_driver />
+    </param>
+    <param
+     id="1144"
+     group="0"
      name="Butt_Physics_UpDown_Spring"
      label="Butt Physics UpDown Spring"
      wearable="physics"
-     edit_group="physics_butt"
+     edit_group="physics_butt_updown"
      value_default=".1"
      value_min="0"
      value_max="1">
 	 <param_driver />
     </param>
     <param
-     id="1144"
+     id="1145"
      group="0"
      name="Butt_Physics_UpDown_Gain"
      label="Butt Physics UpDown Gain"
      wearable="physics"
-     edit_group="physics_butt"
+     edit_group="physics_butt_updown"
      value_default="10"
      value_min="1"
      value_max="100">
 	 <param_driver />
     </param>
     <param
-     id="1145"
+     id="1146"
      group="0"
      name="Butt_Physics_UpDown_Damping"
      label="Butt Physics UpDown Damping"
      wearable="physics"
-     edit_group="physics_butt"
+     edit_group="physics_butt_updown"
      value_default=".05"
      value_min="0"
      value_max=".1">
 	 <param_driver />
     </param>
    <param
-     id="1146"
+     id="1147"
      group="0"
      name="Butt_Physics_UpDown_Drag"
      label="Butt Physics UpDown Drag"
      wearable="physics"
-     edit_group="physics_butt"
+     edit_group="physics_butt_updown"
      value_default=".15"
      value_min="0"
      value_max=".5">
 	 <param_driver />
     </param>
+
    <param
-     id="1147"
+     id="1148"
      group="0"
-     name="Butt_Physics_UpDown_Max_Velocity"
-     label="Butt Physics UpDown Max Speed"
+     name="Butt_Physics_LeftRight_Max_Velocity"
+     label="Butt Physics LeftRight Max Speed"
      wearable="physics"
-     edit_group="physics_butt"
+     edit_group="physics_butt_leftright"
      value_default="0"
      value_min="0"
      value_max="10">
 	 <param_driver />
     </param>
     <param
-     id="1148"
+     id="1149"
      group="0"
      name="Butt_Physics_LeftRight_Spring"
      label="Butt Physics LeftRight Spring"
      wearable="physics"
-     edit_group="physics_butt"
+     edit_group="physics_butt_leftright"
      value_default=".1"
      value_min="0"
      value_max="1">
 	 <param_driver />
     </param>
     <param
-     id="1149"
+     id="1150"
      group="0"
      name="Butt_Physics_LeftRight_Gain"
      label="Butt Physics LeftRight Gain"
      wearable="physics"
-     edit_group="physics_butt"
+     edit_group="physics_butt_leftright"
      value_default="10"
      value_min="1"
      value_max="100">
 	 <param_driver />
     </param>
     <param
-     id="1150"
+     id="1151"
      group="0"
      name="Butt_Physics_LeftRight_Damping"
      label="Butt Physics LeftRight Damping"
      wearable="physics"
-     edit_group="physics_butt"
+     edit_group="physics_butt_leftright"
      value_default=".05"
      value_min="0"
      value_max=".1">
 	 <param_driver />
     </param>
    <param
-     id="1151"
+     id="1152"
      group="0"
      name="Butt_Physics_LeftRight_Drag"
      label="Butt Physics LeftRight Drag"
      wearable="physics"
-     edit_group="physics_butt"
+     edit_group="physics_butt_leftright"
      value_default=".15"
      value_min="0"
      value_max=".5">
 	 <param_driver />
     </param>
-   <param
-     id="1152"
-     group="0"
-     name="Butt_Physics_LeftRight_Max_Velocity"
-     label="Butt Physics LeftRight Max Speed"
-     wearable="physics"
-     edit_group="physics_butt"
-     value_default="0"
-     value_min="0"
-     value_max="10">
-	 <param_driver />
-    </param>
+
 
   </driver_parameters>
 
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">
      <accordion
-        fit_parent="true"
         follows="all"
-        height ="300"
+        height ="388"
         layout="topleft"
         left="0"
 		single_expansion="true"
@@ -35,13 +34,27 @@
 			layout="topleft"
             fit_panel="false"
 			min_height="50"
-			name="physics_breasts_tab"
-			title="Breasts">
+			name="physics_breasts_updown_tab"
+			title="Breasts Bounce">
 			<scrolling_panel_list
 				follows="all"
                 layout="topleft"
 				left="0"
-				name="physics_breasts_param_list"
+				name="physics_breasts_updown_param_list"
+				top="0"
+				width="303" />
+		</accordion_tab>
+		<accordion_tab
+			layout="topleft"
+            fit_panel="false"
+			min_height="50"
+			name="physics_breasts_inout_tab"
+			title="Breasts Cleavage">
+			<scrolling_panel_list
+				follows="all"
+                layout="topleft"
+				left="0"
+				name="physics_breasts_inout_param_list"
 				top="0"
 				width="303" />
 		</accordion_tab>
@@ -50,12 +63,12 @@
             fit_panel="false"
 			min_height="50"
 			name="physics_belly_tab"
-			title="Belly">
+			title="Belly Bounce">
 			<scrolling_panel_list
 				follows="all"
                 layout="topleft"
 				left="0"
-				name="physics_belly_param_list"
+				name="physics_belly_updown_param_list"
 				top="0"
 				width="303" />
 		</accordion_tab>
@@ -65,12 +78,27 @@
             fit_panel="false"
 			min_height="50"
 			name="physics_butt_tab"
-			title="Butt">
+			title="Butt Bounce">
+			<scrolling_panel_list
+				follows="all"
+                layout="topleft"
+				left="0"
+				name="physics_butt_updown_param_list"
+				top="0"
+				width="303" />
+		</accordion_tab>
+
+		<accordion_tab
+			layout="topleft"
+            fit_panel="false"
+			min_height="50"
+			name="physics_butt_leftright_tab"
+			title="Butt Sway">
 			<scrolling_panel_list
 				follows="all"
                 layout="topleft"
 				left="0"
-				name="physics_butt_param_list"
+				name="physics_butt_leftright_param_list"
 				top="0"
 				width="303" />
 		</accordion_tab>
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].
 
 <string name="Bow Legged">Bow Legged</string>
 <string name="Breast Physics UpDown Controller">Breast Buoyancy</string>
-<string name="Breast Physics Side Controller">Breast Cleavage</string>
+<string name="Breast Physics InOut Controller">Breast Cleavage</string>
 <string name="Breast Size">Breast Size</string>
 <string name="Bridge Width">Bridge Width</string>
 <string name="Broad">Broad</string>
@@ -2511,42 +2511,47 @@ 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">Breast Mass</string>
-<string name="Breast Physics Smoothing">Breast Smoothing</string>
-<string name="Breast Physics Gravity">Breast Gravity</string>
-<string name="Breast Physics Side Spring">Breast Side Spring</string>
-<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 Max Speed">Breast Side Max Speed</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 Max Speed">Breast UpDown Max Speed</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 Spring">Belly UpDown Spring</string>
-<string name="Belly Physics UpDown Gain">Belly UpDown Gain</string>
-<string name="Belly Physics UpDown Damping">Belly UpDown Damping</string>
-<string name="Belly Physics UpDown Drag">Belly UpDown Drag</string>
-<string name="Belly Physics UpDown Max Speed">Belly UpDown Max Speed</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 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 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="Belly Physics Mass">Mass</string>
+<string name="Belly Physics Smoothing">Smoothing</string>
+<string name="Belly Physics Gravity">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="Butt Physics Mass">Butt Mass</string>
 <string name="Butt Physics Smoothing">Butt Smoothing</string>
 <string name="Butt Physics Gravity">Butt Gravity</string>
-<string name="Butt Physics UpDown Spring">Butt UpDown Spring</string>
-<string name="Butt Physics UpDown Gain">Butt UpDown Gain</string>
-<string name="Butt Physics UpDown Damping">Butt UpDown Damping</string>
-<string name="Butt Physics UpDown Drag">Butt UpDown Drag</string>
-<string name="Butt Physics UpDown Max Speed">Butt UpDown Max Speed</string>
-<string name="Butt Physics LeftRight Spring">Butt LeftRight Spring</string>
-<string name="Butt Physics LeftRight Gain">Butt LeftRight Gain</string>
-<string name="Butt Physics LeftRight Damping">Butt LeftRight Damping</string>
-<string name="Butt Physics LeftRight Drag">Butt LeftRight Drag</string>
-<string name="Butt Physics LeftRight Max Speed">Butt LeftRight Max Speed</string>
+
+<string name="Butt Physics UpDown Max Speed">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 UpDown Drag">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="Bushy Eyebrows">Bushy Eyebrows</string>
 <string name="Bushy Hair">Bushy Hair</string>