From 90b6b7e1b70a9bc8eb5def793616149fa0fceb4d Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Thu, 31 Mar 2011 11:38:34 -0400
Subject: Created Advanced Physics panel. Made a bunch of aesthetic changes to
 physics panel accordion.

---
 .../skins/default/xui/en/panel_edit_physics.xml    | 58 ++++++++++++++--------
 .../default/xui/en/panel_scrolling_param_base.xml  | 13 ++---
 indra/newview/skins/default/xui/en/strings.xml     | 22 ++++----
 3 files changed, 55 insertions(+), 38 deletions(-)

(limited to 'indra/newview/skins/default/xui')

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 94cb68abbc..c6f974f4f1 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 177a2fe9f0..1351f75623 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 88b5eb7e23..6f03606869 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>
-- 
cgit v1.2.3