summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-09-09 16:42:55 -0400
committerOz Linden <oz@lindenlab.com>2013-09-09 16:42:55 -0400
commit1f9940d779bc1228139ecad9f7eec1425325ae69 (patch)
tree1f04c2243f929dedddc657e021f8b34bf04ff59a
parentd53f9366d0bca6f2c877d8162866076e6aa1229f (diff)
parente9af62b7e552005571ce105f14f798a7003aabe6 (diff)
merge changes for storm-1939
-rwxr-xr-xindra/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 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="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"