diff options
author | Merov Linden <merov@lindenlab.com> | 2013-10-28 12:14:27 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-10-28 12:14:27 -0700 |
commit | 026b528b86a853a923ec87dd3897fe2079cbd539 (patch) | |
tree | b31ec200f751a5c0817a6e628ae6e6c4f394bf77 /indra/newview/skins/default/xui/en/panel_preferences_move.xml | |
parent | ee74eb1a9ee8e2aba49613cf434f1272a4526417 (diff) | |
parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_preferences_move.xml')
-rwxr-xr-x | indra/newview/skins/default/xui/en/panel_preferences_move.xml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml index d9067b41c7..8794e3bf95 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml @@ -129,6 +129,16 @@ name="tap_tap_hold_to_run" width="237" top_pad="0"/> + <check_box + control_name="AutomaticFly" + follows="left|top" + height="20" + label="Hold jump or crouch key to start or stop flying" + layout="topleft" + left_delta="0" + name="automatic_fly" + width="237" + top_pad="0"/> <text follows="left|top" type="string" @@ -260,4 +270,4 @@ function="Floater.Show" parameter="pref_joystick" /> </button> -</panel>
\ No newline at end of file +</panel> |