summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2015-12-02 15:02:37 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2015-12-02 15:02:37 -0500
commitcd24237a5bb4a0028f18833e527d5268570f6483 (patch)
tree3eb1507560376b6798f4c47c8e6bc3f4f4f7e923 /indra/newview/skins/default
parentaac43b9227617a7d53a505bf69f1c3b3171e66e9 (diff)
SL-238 WIP - added checkbox for enhanced skeleton.
Diffstat (limited to 'indra/newview/skins/default')
-rwxr-xr-xindra/newview/skins/default/xui/en/floater_preferences.xml6
-rwxr-xr-xindra/newview/skins/default/xui/en/panel_preferences_graphics1.xml19
-rwxr-xr-xindra/newview/skins/default/xui/en/panel_preferences_sound.xml2
3 files changed, 20 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index bd6faf4ed8..502c6e0f1f 100755
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -3,7 +3,7 @@
legacy_header_height="18"
positioning="centered"
default_tab_group="1"
- height="460"
+ height="512"
layout="topleft"
name="Preferences"
help_topic="preferences"
@@ -19,7 +19,7 @@
layout="topleft"
right="-105"
name="OK"
- top="433"
+ top="473"
width="90">
<button.commit_callback
function="Pref.OK" />
@@ -40,7 +40,7 @@
<tab_container
follows="all"
halign="left"
- height="410"
+ height="440"
layout="topleft"
left="0"
name="pref core"
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 6c485c0595..923e1f1b06 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -2,7 +2,7 @@
<panel
border="true"
follows="left|top|right|bottom"
- height="418"
+ height="438"
label="Graphics"
layout="topleft"
left="102"
@@ -813,6 +813,19 @@
function="Pref.VertexShaderEnable" />
</check_box>
<check_box
+ control_name="RenderAvatarEnhancedSkeleton"
+ height="16"
+ initial_value="true"
+ label="Enhanced skeleton"
+ layout="topleft"
+ left_delta="0"
+ name="AvatarEnhancedSkeleton"
+ top_pad="1"
+ width="256">
+ <check_box.commit_callback
+ function="Pref.EnhancedSkeletonEnable" />
+ </check_box>
+ <check_box
control_name="RenderAvatarCloth"
height="16"
initial_value="true"
@@ -869,7 +882,7 @@
layout="topleft"
left="10"
name="Apply"
- top="390"
+ top="400"
width="115">
<button.commit_callback
function="Pref.Apply" />
@@ -881,7 +894,7 @@
layout="topleft"
left_pad="3"
name="Defaults"
- top="390"
+ top="400"
width="115">
<button.commit_callback
function="Pref.HardwareDefaults" />
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 615abbaa89..53b74fa645 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -2,7 +2,7 @@
<panel
border="true"
follows="all"
- height="408"
+ height="438"
label="Sounds"
layout="topleft"
left="102"