summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_physics.xml92
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml10
-rw-r--r--indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml13
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml60
4 files changed, 118 insertions, 57 deletions
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 0eb9c703ca..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,70 +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
- fit_parent="true"
follows="all"
- height ="300"
+ height ="388"
layout="topleft"
left="0"
- name="wearable_accordion"
- 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_tab"
- title="Breasts">
+ name="physics_breasts_updown_tab"
+ title="Breasts Bounce">
<scrolling_panel_list
follows="all"
- layout="topleft"
+ layout="topleft"
+ left="10"
+ name="physics_breasts_updown_param_list"
+ top="10"
+ 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_param_list"
- top="0"
+ name="physics_breasts_inout_param_list"
+ 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">
+ title="Belly Bounce">
<scrolling_panel_list
follows="all"
- layout="topleft"
+ layout="topleft"
left="0"
- name="physics_belly_param_list"
- top="0"
+ name="physics_belly_updown_param_list"
+ 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">
+ title="Butt Bounce">
+ <scrolling_panel_list
+ follows="all"
+ layout="topleft"
+ left="0"
+ name="physics_butt_updown_param_list"
+ top_pad="30"
+ 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_leftright_param_list"
+ 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"
+ layout="topleft"
left="0"
- name="physics_butt_param_list"
- top="0"
+ name="physics_advanced_param_list"
+ top_pad="10"
width="303" />
</accordion_tab>
</accordion>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 6904cfa50e..d74197d965 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -331,16 +331,16 @@
control_name="RenderAvatarPhysicsLODFactor"
follows="left|top"
height="16"
- increment="0.125"
- initial_value="160"
+ initial_value="100"
+ increment=".05"
label=" Avatar Physics:"
label_width="85"
layout="topleft"
- left_delta="-6"
+ left_delta="-16"
name="AvatarPhysicsDetail"
show_text="false"
top_pad="12"
- width="154">
+ width="160">
<slider.commit_callback
function="Pref.UpdateSliderText"
parameter="AvatarPhysicsDetailText" />
@@ -351,7 +351,7 @@
follows="left|top"
height="12"
layout="topleft"
- left_delta="160"
+ left_delta="165"
name="AvatarPhysicsDetailText"
top_pad="-16"
width="128">
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 86c88a726b..ed7814e0f0 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>
@@ -2515,27 +2515,43 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<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 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 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 Max Speed">Butt UpDown Max Speed</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">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">Breast Bounce Drag</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">Belly Bounce 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 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">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">Butt Sway Drag</string>
<string name="Bushy Eyebrows">Bushy Eyebrows</string>
<string name="Bushy Hair">Bushy Hair</string>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 06:17:28 +0000