summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-03-15 11:40:15 -0400
committerLoren Shih <seraph@lindenlab.com>2011-03-15 11:40:15 -0400
commit27d34b5707934438e2363b5e8702bbbaedb3e2b6 (patch)
tree6c2a3acb48ac377252226be529e6b0409e6e2650 /indra/newview/skins/default
parent01600af612df4421a7f095a67db2f135da9fe161 (diff)
parent16ff50719055aae202011e4b20aeae41d98493fa (diff)
Automated merge from mesh-development
Diffstat (limited to 'indra/newview/skins/default')
-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 ca4e4a3a2a..e79dfcbc7d 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -388,6 +388,13 @@
<check_box top_pad="5" name="upload_textures" height="15" follows="top|left" label="Textures"/>
<check_box top_pad="5" name="upload_skin" height="15" follows="top|left" label="Skin weight"/>
<check_box top_pad="5" left="20" name="upload_joints" height="15" follows="top|left" label="Joint positions"/>
+
+ <text left="10" top_pad="4" width="90" bottom="30" follows="top|left" height="15">
+ Pelvis Offset:
+ </text>
+
+ <spinner left="10" top_pad="4" height="20" follows="top|left" width="80" value="0.0" min_val="0.00" max_val="32.0" name="pelvis_offset"/>
+
</panel>
</tab_container>