summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-03-21 11:31:27 -0400
committerOz Linden <oz@lindenlab.com>2013-03-21 11:31:27 -0400
commite9af62b7e552005571ce105f14f798a7003aabe6 (patch)
tree0a050d9889adc98c4e5edab36380f98192f5874e /indra/newview/skins/default/xui
parentbd57150f13c64b208c7f36b22f2141665e0b8c80 (diff)
parent409a401ebb59fcf28ba25aaeab44ca8d00960c84 (diff)
merge changes for storm-1939
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_move.xml10
1 files changed, 10 insertions, 0 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..198fcf9355 100644
--- 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="Fly/land on holding up/down"
+ layout="topleft"
+ left_delta="0"
+ name="automatic_fly"
+ width="237"
+ top_pad="0"/>
<text
follows="left|top"
type="string"