diff options
| author | Callum Prentice <callum@gmail.com> | 2020-05-20 14:21:31 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2020-05-20 14:21:31 -0700 |
| commit | b1e063fe8c339c339a5d154e2f48fb8accf6f71c (patch) | |
| tree | 02322319b2106e1cb9d6d998e23d3fcd753dadd1 /indra/newview/skins/default/xui/en/floater_edit_hover_height.xml | |
| parent | 09802fa8ea9c8459e13a32720088f6d6fb1ad42d (diff) | |
| parent | ed3d9abdd01304b5a9708880d9b150fb6568256b (diff) | |
Merge branch 'master' into DRTVWR-512
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> |