summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2016-09-27 08:03:48 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2016-09-27 08:03:48 -0400
commit996861e21bf165d73ebd80eae50ad1e8f61ee55d (patch)
tree6162de48ebb08e8f46bf361f488ef85b2391b8f0 /indra/newview/skins/default/xui/en
parent2be27c26e849935600efde49399cbeff399c45a3 (diff)
parent6c46b3caf20af1a2987c0ca4ed0bf8e6ebe80fb4 (diff)
merge
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/floater_model_preview.xml7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index d2c8dddfe1..2750316f2e 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1217,6 +1217,13 @@
label_text.text_color="White"
name="upload_joints"
top_pad="15"/>
+ <check_box
+ follows="top|left"
+ height="15"
+ label="Lock scale if joint position defined"
+ label_text.text_color="White"
+ name="lock_scale_if_joint_position"
+ top_pad="15"/>
<text
follows="top|left"
height="15"