diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-08-26 14:34:50 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-08-26 14:34:50 -0400 |
| commit | 838c01e87d69a29f39554fbc5fa972ddd3baace1 (patch) | |
| tree | 7d38ae0017f606ef12416ab8a9ce80dcd966ed77 /indra/newview/skins/default | |
| parent | 1a8d917a6d0d2393a0f0248d0072dd7cfd487609 (diff) | |
| parent | b2b670d787eaa1789b87a62178c970dfb20c02d2 (diff) | |
re-merge change from Thickbrick (minor collisions with changes from viewer-public merge)
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_tools.xml | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 514b0a501b..1d58e7a540 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -2408,7 +2408,7 @@ even though the user gets a free copy. name="label shininess" left_pad="4" text_readonly_color="LabelDisabledColor" - top_pad="-36" + top_pad="-37" width="90"> Shininess </text> @@ -2445,7 +2445,7 @@ even though the user gets a free copy. left_pad="4" name="label bumpiness" text_readonly_color="LabelDisabledColor" - top_pad="-36" + top_pad="-37" width="90"> Bumpiness </text> @@ -2563,6 +2563,17 @@ even though the user gets a free copy. top_delta="-4" width="120" /> --> + <check_box + follows="top|left" + height="16" + initial_value="false" + label="Align planar faces" + layout="topleft" + left="17" + name="checkbox planar align" + tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping." + top_delta="26" + width="140" /> <text type="string" length="1" @@ -2572,8 +2583,8 @@ even though the user gets a free copy. left="10" name="rpt" text_readonly_color="LabelDisabledColor" - top_pad="4" - width="200"> + top_pad="2" + width="140"> Repeats / Face </text> <spinner @@ -2586,7 +2597,7 @@ even though the user gets a free copy. left="20" max_val="100" name="TexScaleU" - top_pad="6" + top_pad="5" width="185" /> <check_box height="19" @@ -2696,7 +2707,7 @@ even though the user gets a free copy. bg_alpha_color="DkGray" name="Add_Media" left="0" - height="63" + height="47" width="290"> <text type="string" @@ -2782,8 +2793,9 @@ even though the user gets a free copy. label="Align" label_selected="Align Media" layout="topleft" - right="-10" + right="-16" name="button align" + top_delta="-4" tool_tip="Align media texture (must load first)" width="80" /> </panel> |