diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2020-05-18 16:33:16 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-05-18 16:33:16 -0400 |
| commit | 89c5b4623e09fbe98cddf4a3a42e13e6e1fce230 (patch) | |
| tree | 52dc42818c76374a7d27b58d82c1cd7171f9c127 /indra/newview/skins/default/xui/en/floater_edit_hover_height.xml | |
| parent | 9d5d257ceeb8297bcd8ac17164b6584717b5c024 (diff) | |
| parent | ed3d9abdd01304b5a9708880d9b150fb6568256b (diff) | |
DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_edit_hover_height.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_edit_hover_height.xml | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml b/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml index 52084e5f8e..3570456b44 100644 --- a/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml @@ -4,18 +4,16 @@ legacy_header_height="225" can_minimize="true" can_close="true" - can_resize="true" - min_height="65" - min_width="515" - height="65" + can_resize="false" + height="80" + width="515" layout="topleft" name="HoverHeight" single_instance="true" help_topic="hover_height" save_rect="true" save_visibility="true" - title="SET HOVER HEIGHT" - width="515"> + title="SET HOVER HEIGHT"> <slider enabled="false" control_name="HoverHeightSlider" @@ -34,4 +32,13 @@ can_edit_text="true" > </slider> + <check_box + control_name="HoverHeightAffectsCamera" + follows="all" + height="15" + label="Bind Camera view" + layout="topleft" + name="BindCameraCheck" + top_pad="7" + width="237"/> </floater> |