diff --git a/indra/newview/app_settings/settings_ascent.xml b/indra/newview/app_settings/settings_ascent.xml
index f37e477d6..5d49b854c 100644
--- a/indra/newview/app_settings/settings_ascent.xml
+++ b/indra/newview/app_settings/settings_ascent.xml
@@ -1670,6 +1670,17 @@
       <key>Value</key>
       <boolean>0</boolean>
     </map>
+    <key>ToolbarVisibleQuit</key>
+    <map>
+      <key>Comment</key>
+      <string>Whether or not the button to quit is on the toolbar</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <boolean>0</boolean>
+    </map>
     <key>ToolbarVisibleRadar</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llmenucommands.cpp b/indra/newview/llmenucommands.cpp
index afb66ee77..6183c6942 100644
--- a/indra/newview/llmenucommands.cpp
+++ b/indra/newview/llmenucommands.cpp
@@ -204,6 +204,7 @@ struct MenuFloaterDict : public LLSingleton<MenuFloaterDict>
 		registerFloater("outfit", boost::bind(show_outfit_dialog));
 		registerFloater("PostProcess", boost::bind(LLFloaterPostProcess::show));
 		registerFloater("preferences", boost::bind(LLFloaterPreference::show, (void*)NULL));
+		registerFloater("quit", boost::bind(&LLAppViewer::userQuit, LLAppViewer::instance()));
 		registerFloater("RegionDebugConsole", boost::bind(handle_singleton_toggle<LLFloaterRegionDebugConsole>, (void*)NULL), boost::bind(LLFloaterRegionDebugConsole::instanceExists));
 		registerFloater("script errors", boost::bind(LLFloaterScriptDebug::show, LLUUID::null));
 		registerFloater("search", boost::bind(toggle_search_floater));
diff --git a/indra/newview/skins/default/textures/icn_toolbar_quit.tga b/indra/newview/skins/default/textures/icn_toolbar_quit.tga
new file mode 100644
index 000000000..0a1a235f3
Binary files /dev/null and b/indra/newview/skins/default/textures/icn_toolbar_quit.tga differ
diff --git a/indra/newview/skins/default/xui/en-us/floater_toolbar_prefs.xml b/indra/newview/skins/default/xui/en-us/floater_toolbar_prefs.xml
index f2166ff83..f6e5da685 100644
--- a/indra/newview/skins/default/xui/en-us/floater_toolbar_prefs.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_toolbar_prefs.xml
@@ -94,5 +94,6 @@
   -->
   <check_box bottom_delta="-20" label="Tutorial" name="tutorial_btn" follows="left|right" control_name="ToolbarVisibleHelpTutorial"/>
   <check_box bottom_delta="-20" label="About [SHORT_APP_NAME]" name="about_btn" follows="left|right" control_name="ToolbarVisibleAbout"/>
+  <check_box bottom_delta="-20" label="Quit" name="quit_btn" follows="left|right" control_name="ToolbarVisibleQuit"/>
   <check_box bottom_delta="-20" label="Change Buttons" name="change_buttons_btn" follows="left|right" control_name="ToolbarVisibleToolbarPrefs"/>
 </floater>
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 1c4d8b23b..57a0acae8 100644
--- a/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
@@ -472,6 +472,11 @@
         <button.commit_callback function="ShowFloater" parameter="about"/>
       </button>
     </layout_panel>
+    <layout_panel name="panelquit" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleQuit">
+      <button bottom="0" height="24" label="Quit" name="quit_btn" image_overlay="icn_toolbar_quit.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" width="50" follows="left|right">
+        <button.commit_callback function="ShowFloater" parameter="quit"/>
+      </button>
+    </layout_panel>
     <layout_panel name="paneltoolbarprefs" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleToolbarPrefs">
       <button bottom="0" height="24" label="Change Buttons" name="change_buttons_btn" image_overlay="icn_toolbar_change_buttons.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" width="50" follows="left|right">
         <button.commit_callback function="ShowFloater" parameter="floater_toolbar_prefs.xml"/>