From 3208104e2e51124fb6ee90133fee328f59e1fddc Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Tue, 29 Mar 2011 20:57:17 -0400
Subject: A bit of rearchitecture so that we can have edit wearables that don't
 have associated snapshots.  Needed to support physics wearables, which don't
 use a snapshot.

---
 .../default/xui/en/panel_scrolling_param_base.xml  | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml

(limited to 'indra/newview/skins')

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
new file mode 100644
index 0000000000..177a2fe9f0
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ layout="topleft"
+ left="0"
+ name="LLScrollingPanelParamBase"
+ height="20"
+ width="290">
+    <slider
+     can_edit_text="true"
+     decimal_digits="0"
+     enabled="false"
+     height="16"
+     increment="1"
+     initial_value="0"
+     label="[DESC]"
+     layout="bottom|left"
+     left="6"
+     max_val="100"
+     name="param slider"
+     bottom="1"
+     width="274" 
+     slider_label.font.style="BOLD" />
+</panel>
-- 
cgit v1.2.3


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.

---
 .../skins/default/xui/en/panel_edit_physics.xml    | 37 +++++++++++++++++++---
 indra/newview/skins/default/xui/en/strings.xml     |  5 +--
 2 files changed, 34 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins')

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