From 92802e69509824f1d3dca212726373fd9d799104 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Tue, 29 Mar 2011 21:56:18 -0400
Subject: Fixed some labels, and made some labels/wearables hidden in edit.
 Added accordions for physics.

---
 indra/newview/character/avatar_lad.xml             | 156 +++++++--------------
 indra/newview/llpaneleditwearable.cpp              |  10 +-
 .../skins/default/xui/en/panel_edit_physics.xml    |  37 ++++-
 indra/newview/skins/default/xui/en/strings.xml     |   5 +-
 4 files changed, 95 insertions(+), 113 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 160b8f3408..7ab93d3fce 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -3798,7 +3798,7 @@
      id="1092"
      group="1"
      name="Belly_Torso_Physics_UpDown_Driven"
-     wearable="shape"
+     wearable="physics"
      edit_group="driven"
      value_default="0"
      value_min="-1"
@@ -4394,7 +4394,7 @@
      id="1093"
      group="1"
      name="Belly_Legs_Physics_UpDown_Driven"
-     wearable="shape"
+     wearable="physics"
      edit_group="driven"
      value_min="-1"
      value_max="1">
@@ -4444,7 +4444,7 @@
      id="1089"
      group="0"
      name="Butt_Physics_UpDown_Driven"
-     wearable="shape"
+     wearable="physics"
      edit_group="driven"
      label_min="Separate"
      label_max="Join"
@@ -4460,7 +4460,7 @@
      id="1090"
      group="0"
      name="Butt_Physics_LeftRight_Driven"
-     wearable="shape"
+     wearable="physics"
      edit_group="driven"
      label_min="Separate"
      label_max="Join"
@@ -5189,7 +5189,7 @@
      id="1094"
      group="1"
      name="Belly_Skirt_Physics_UpDown_Driven"
-     wearable="skirt"
+     wearable="physics"
      edit_group="driven"
      cross_wearable="true"
      value_min="-1"
@@ -9138,14 +9138,12 @@ render_pass="bump">
      name="Breast_Physics_Mass"
      label="Breast Physics Mass"
      wearable="physics"
-     edit_group="physics"
+     edit_group="physics_breasts"
      label_min="Less"
      label_max="More"
      value_default=".1"
      value_min=".1"
-     value_max="1"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max="1">
 	 <param_driver />
     </param>
 
@@ -9156,14 +9154,12 @@ render_pass="bump">
      name="Breast_Physics_Smoothing"
      label="Breast Physics Smoothing"
      wearable="physics"
-     edit_group="physics"
+     edit_group="physics_breasts"
      label_min="Less"
      label_max="More"
      value_default="2"
      value_min="1"
-     value_max="10"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max="10">
 	 <param_driver />
     </param>
 
@@ -9174,14 +9170,12 @@ render_pass="bump">
      name="Breast_Physics_Gravity"
      label="Breast Physics Gravity"
      wearable="physics"
-     edit_group="physics"
+     edit_group="physics_breasts"
      label_min="Less"
      label_max="More"
      value_default="0"
      value_min="0"
-     value_max="1"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max="1">
 	 <param_driver />
     </param>
 
@@ -9192,14 +9186,12 @@ render_pass="bump">
      name="Breast_Physics_Side_Spring"
      label="Breast Physics Side Spring"
      wearable="physics"
-     edit_group="physics"
+     edit_group="physics_breasts"
      label_min="Less"
      label_max="More"
      value_default=".1"
      value_min="0"
-     value_max="1"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max="1">
 	 <param_driver />
     </param>
 
@@ -9210,14 +9202,12 @@ render_pass="bump">
      name="Breast_Physics_Side_Gain"
      label="Breast Physics Side Gain"
      wearable="physics"
-     edit_group="physics"
+     edit_group="physics_breasts"
      label_min="Less"
      label_max="More"
      value_default="10"
      value_min="1"
-     value_max="100"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max="100">
 	 <param_driver />
     </param>
 
@@ -9233,9 +9223,7 @@ render_pass="bump">
      label_max="More"
      value_default=".05"
      value_min="0"
-     value_max=".1"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max=".1">
 	 <param_driver />
     </param>
 
@@ -9246,14 +9234,12 @@ render_pass="bump">
      name="Breast_Physics_Side_Drag"
      label="Breast Physics Side Drag"
      wearable="physics"
-     edit_group="physics"
+     edit_group="physics_breasts"
      label_min="Less"
      label_max="More"
      value_default=".15"
      value_min="0"
-     value_max=".5"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max=".5">
 	 <param_driver />
     </param>
 
@@ -9264,14 +9250,12 @@ render_pass="bump">
      name="Breast_Physics_Side_Max_Velocity"
      label="Breast Physics Side Max Speed"
      wearable="physics"
-     edit_group="physics"
+     edit_group="physics_breasts"
      label_min="Less"
      label_max="More"
      value_default="0"
      value_min="0"
-     value_max="10"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max="10">
 	 <param_driver />
     </param>
 
@@ -9283,14 +9267,12 @@ render_pass="bump">
      name="Breast_Physics_UpDown_Spring"
      label="Breast Physics UpDown Spring"
      wearable="physics"
-     edit_group="physics"
+     edit_group="physics_breasts"
      label_min="Less"
      label_max="More"
      value_default=".1"
      value_min="0"
-     value_max="1"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max="1">
 	 <param_driver />
     </param>
 
@@ -9301,14 +9283,12 @@ render_pass="bump">
      name="Breast_Physics_UpDown_Gain"
      label="Breast Physics UpDown Gain"
      wearable="physics"
-     edit_group="physics"
+     edit_group="physics_breasts"
      label_min="Less"
      label_max="More"
      value_default="10"
      value_min="1"
-     value_max="100"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max="100">
 	 <param_driver />
     </param>
 
@@ -9319,7 +9299,7 @@ render_pass="bump">
      name="Breast_Physics_UpDown_Damping"
      label="Breast Physics UpDown Damping"
      wearable="physics"
-     edit_group="physics"
+     edit_group="physics_breasts"
      label_min="Less"
      label_max="More"
      value_default=".05"
@@ -9337,14 +9317,12 @@ render_pass="bump">
      name="Breast_Physics_UpDown_Drag"
      label="Breast Physics UpDown Drag"
      wearable="physics"
-     edit_group="physics"
+     edit_group="physics_breasts"
      label_min="Less"
      label_max="More"
      value_default=".15"
      value_min="0"
-     value_max=".5"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max=".5">
 	 <param_driver />
     </param>
 
@@ -9355,32 +9333,27 @@ render_pass="bump">
      name="Breast_Physics_UpDown_Max_Velocity"
      label="Breast Physics UpDown Max Speed"
      wearable="physics"
-     edit_group="physics"
+     edit_group="physics_breasts"
      label_min="Less"
      label_max="More"
      value_default="0"
      value_min="0"
-     value_max="10"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max="10">
 	 <param_driver />
     </param>
 
     <param
      id="1104"
-     group="0"
+     group="1"
      wearable="shape"
-     edit_group="shape_legs"
-     edit_group_order="14"
+     edit_group="physics_butt"
      name="Butt_Physics_UpDown_Controller"
      label="Butt Physics UpDown Controller"
      label_min="Down"
      label_max="Up"
      value_min="-1"
      value_max="1"
-     value_default="0"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_default="0">
       <param_driver>
         <driven
          id="1089" />
@@ -9389,19 +9362,16 @@ render_pass="bump">
 
     <param
      id="1105"
-     group="0"
+     group="1"
      wearable="shape"
-     edit_group="shape_legs"
-     edit_group_order="15"
+     edit_group="physics_butt"
      name="Butt_Physics_LeftRight_Controller"
      label="Butt Physics LeftRight Controller"
      label_min="Down"
      label_max="Up"
      value_min="-1"
      value_max="1"
-     value_default="0"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_default="0">
       <param_driver>
         <driven
          id="1090" />
@@ -9443,9 +9413,7 @@ render_pass="bump">
      label_max="More"
      value_default="0"
      value_min="-.3"
-     value_max="1.3"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max="1.3">
       <param_driver>
         <driven
          id="1088" />
@@ -10177,9 +10145,9 @@ render_pass="bump">
 
     <param
      id="1091"
-     group="0"
-     wearable="shape"
-     edit_group="shape_torso"
+     group="1"
+     wearable="physics"
+     edit_group="physics_belly"
      edit_group_order="14"
      name="Belly_Physics_UpDown_Controller"
      label="Belly Physics UpDown Controller"
@@ -10207,14 +10175,12 @@ render_pass="bump">
      name="Belly_Physics_UpDown_Spring"
      label="Belly Physics UpDown Spring"
      wearable="physics"
-     edit_group="physics"
+     edit_group="physics_belly"
      label_min="Less"
      label_max="More"
      value_default=".1"
      value_min="0"
-     value_max="1"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max="1">
 	 <param_driver />
     </param>
 
@@ -10224,14 +10190,12 @@ render_pass="bump">
      name="Belly_Physics_UpDown_Gain"
      label="Belly Physics UpDown Gain"
      wearable="physics"
-     edit_group="physics"
+     edit_group="physics_belly"
      label_min="Less"
      label_max="More"
      value_default="10"
      value_min="1"
-     value_max="100"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max="100">
 	 <param_driver />
     </param>
 
@@ -10246,9 +10210,7 @@ render_pass="bump">
      label_max="More"
      value_default=".05"
      value_min="0"
-     value_max=".1"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max=".1">
 	 <param_driver />
     </param>
 
@@ -10258,14 +10220,12 @@ render_pass="bump">
      name="Belly_Physics_UpDown_Max_Velocity"
      label="Belly Physics UpDown Max Speed"
      wearable="physics"
-     edit_group="physics"
+     edit_group="physics_belly"
      label_min="Less"
      label_max="More"
      value_default="0"
      value_min="0"
-     value_max="10"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max="10">
 	 <param_driver />
     </param>
 
@@ -10275,14 +10235,12 @@ render_pass="bump">
      name="Butt_Physics_UpDown_Spring"
      label="Butt Physics UpDown Spring"
      wearable="physics"
-     edit_group="physics"
+     edit_group="physics_butt"
      label_min="Less"
      label_max="More"
      value_default=".1"
      value_min="0"
-     value_max="1"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max="1">
 	 <param_driver />
     </param>
 
@@ -10292,14 +10250,12 @@ render_pass="bump">
      name="Butt_Physics_UpDown_Gain"
      label="Butt Physics UpDown Gain"
      wearable="physics"
-     edit_group="physics"
+     edit_group="physics_butt"
      label_min="Less"
      label_max="More"
      value_default="10"
      value_min="1"
-     value_max="100"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max="100">
 	 <param_driver />
     </param>
 
@@ -10308,15 +10264,13 @@ render_pass="bump">
      group="0"
      name="Butt_Physics_UpDown_Damping"
      label="Butt Physics UpDown Damping"
-     wearable="physics"
+     wearable="physics_butt"
      edit_group="physics"
      label_min="Less"
      label_max="More"
      value_default=".05"
      value_min="0"
-     value_max=".1"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max=".1">
 	 <param_driver />
     </param>
 
@@ -10326,14 +10280,12 @@ render_pass="bump">
      name="Butt_Physics_UpDown_Max_Velocity"
      label="Butt Physics UpDown Max Speed"
      wearable="physics"
-     edit_group="physics"
+     edit_group="physics_butt"
      label_min="Less"
      label_max="More"
      value_default="0"
      value_min="0"
-     value_max="10"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max="10">
 	 <param_driver />
     </param>
 
diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp
index a7d20acbbc..d04604a644 100644
--- a/indra/newview/llpaneleditwearable.cpp
+++ b/indra/newview/llpaneleditwearable.cpp
@@ -95,7 +95,9 @@ enum ESubpart {
 	SUBPART_SKIRT,
 	SUBPART_ALPHA,
 	SUBPART_TATTOO,
-	SUBPART_PHYSICS
+	SUBPART_PHYSICS_BREASTS,
+	SUBPART_PHYSICS_BELLY,
+	SUBPART_PHYSICS_BUTT
  };
 
 using namespace LLVOAvatarDefines;
@@ -234,7 +236,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,1, SUBPART_PHYSICS));
+	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));
 }
 
 LLEditWearableDictionary::WearableEntry::WearableEntry(LLWearableType::EType type,
@@ -305,7 +307,9 @@ 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, new SubpartEntry(SUBPART_PHYSICS, "mTorso", "physics", "physics_main_param_list", "physics_main_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(-1.f, 0.15f, 0.3f),SEX_FEMALE));
+	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));
 }
 
 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 4e781e2360..0eb9c703ca 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_physics.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_physics.xml
@@ -34,14 +34,43 @@
 		<accordion_tab
 			layout="topleft"
             fit_panel="false"
-			min_height="150"
-			name="physics_main_tab"
-			title="Physics">
+			min_height="50"
+			name="physics_breasts_tab"
+			title="Breasts">
 			<scrolling_panel_list
 				follows="all"
                 layout="topleft"
 				left="0"
-				name="physics_main_param_list"
+				name="physics_breasts_param_list"
+				top="0"
+				width="303" />
+		</accordion_tab>
+		<accordion_tab
+			layout="topleft"
+            fit_panel="false"
+			min_height="50"
+			name="physics_belly_tab"
+			title="Belly">
+			<scrolling_panel_list
+				follows="all"
+                layout="topleft"
+				left="0"
+				name="physics_belly_param_list"
+				top="0"
+				width="303" />
+		</accordion_tab>
+
+		<accordion_tab
+			layout="topleft"
+            fit_panel="false"
+			min_height="50"
+			name="physics_butt_tab"
+			title="Butt">
+			<scrolling_panel_list
+				follows="all"
+                layout="topleft"
+				left="0"
+				name="physics_butt_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 e183b0ba78..9570e28d26 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2500,7 +2500,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Body Thin">Body Thin</string>
 
 <string name="Bow Legged">Bow Legged</string>
-<string name="Breast Physics Updown Controller">Breast Buoyancy</string>
+<string name="Breast Physics UpDown Controller">Breast Buoyancy</string>
 <string name="Breast Physics Side Controller">Breast Cleavage</string>
 <string name="Breast Size">Breast Size</string>
 <string name="Bridge Width">Bridge Width</string>
@@ -2527,14 +2527,11 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <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 UpDown Controller">Belly Updown Bounce</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 Max Speed">Belly Updown Max Speed</string>
 
-<string name="Butt Physics UpDown Controller">Butt UpDown Bounce</string>
-<string name="Butt Physics LeftRight Controller">Butt LeftRight Bounce</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>
-- 
cgit v1.2.3