diff --git a/indra/newview/lltoolbar.cpp b/indra/newview/lltoolbar.cpp
index c76be5714..be6f5f798 100644
--- a/indra/newview/lltoolbar.cpp
+++ b/indra/newview/lltoolbar.cpp
@@ -132,6 +132,9 @@ BOOL LLToolBar::postBuild()
 	childSetAction("radar_list_btn", onClickRadarList, this);
 	childSetControlName("radar_list_btn", "RadarListBtnState");
 
+	childSetAction("fly_btn", onClickFly, this);
+	childSetControlName("fly_btn", "FlyBtnState");
+
 	childSetAction("sit_btn", onClickSit, this);
 	childSetControlName("sit_btn", "SitBtnState");
 
diff --git a/indra/newview/skins/default/xui/en-us/panel_toolbar.xml b/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
index df00ca0b6..7e26db011 100644
--- a/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
@@ -26,6 +26,14 @@
 	       label_selected="Radar" left="0" name="radar_list_btn"
 	       tool_tip="View a list of nearby avatars."
 	       width="50" follows="left|right" user_resize="false"/>
+	<button bottom="0" font="SansSerif" height="24" label="Fly"
+        image_overlay="icn_toolbar_fly.tga" image_overlay_alignment="left"
+                        image_selected="toolbar_btn_selected.tga"
+             image_unselected="toolbar_btn_enabled.tga"
+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
+	       label_selected="Stop Flying" left="0" name="fly_btn"
+	       tool_tip="Start flying. Use E/C or PgUp/PgDn to fly up and down."
+	       width="50" follows="left|right" user_resize="false"/>
     <button bottom="0" font="SansSerif" height="24" label="Snapshot" left="0"
              image_overlay="icn_toolbar_snapshot.tga" image_overlay_alignment="left"
                         image_selected="toolbar_btn_selected.tga"