diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-09-28 13:45:42 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-09-28 13:45:42 -0500 |
| commit | 613894c8cca25f9fa86da7056da3594fe8771d46 (patch) | |
| tree | 4667e95a7041fe8d2b08209c73a803f8370a01f1 /indra/newview/skins/default/xui | |
| parent | 7c2b9221d6678ea7a04f529efaa2e557abce504d (diff) | |
SH-238 Add check boxes to upload skin weights (or not) and/or joint positions (or not).
Remove llfloaterimportcollada
Reviewed by Prep.
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_model_preview.xml | 19 |
1 files changed, 15 insertions, 4 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 de9f3ee87e..f505e99c02 100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -134,8 +134,21 @@ <text bottom_delta="25" follows="top|left" height="15" left="10" name="physics info" width="300"> [TRIANGLES] Triangles, [HULLS] Hulls, [POINTS] Points </text> - - <text bottom_delta="20" follows="top|left" height="15" name="description_label"> + + <text bottom_delta="25" follows="top|left" height="15" left="10" name="physics info" width="300"> + Include: + </text> + + <check_box bottom_delta="20" follow="bottom|left" height="20" label="Textures" + left="15" width="125" name="upload_textures" tool_tip="Upload associated textures "/> + + <check_box bottom_delta="20" follow="bottom|left" height="20" label="Skin Weights" + left="15" width="125" name="upload_skin" tool_tip="Upload vertex skin weighting information."/> + + <check_box bottom_delta="20" follow="bottom|left" height="20" label="Joint Positions" + left="15" width="125" name="upload_joints" tool_tip="Upload joint position information (will override avatar joint positions when mesh is worn)."/> + + <text bottom_delta="35" follows="top|left" height="15" name="description_label"> Description: <!-- Info: [PRIM_COST] prim equivalents, [TEXTURES] textures. --> </text> @@ -144,8 +157,6 @@ <button bottom_delta="25" follows="bottom|left" height="20" label="Upload" left="15" name="ok_btn" width="125" tool_tip="Upload to simulator"/> - <check_box bottom_delta="0" follow="bottom|left" height="20" label="Upload Textures" - left="160" width="125" name="upload_textures" tool_tip="Upload associated textures "/> <text bottom_delta="20" left="15" follows="top|left" height="15" name="description_label" text_color="1 0.82 0.46 1"> (No charge for upload during First Look) </text> |