From c4c206076a8eb72258e89025373b1fe409e3926b Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Thu, 10 Jul 2014 23:42:43 -0400
Subject: [PATCH] Add the option to have a toolbar button for joystick
 configuration

---
 indra/newview/llmenucommands.cpp                   |   2 ++
 .../default/textures/icn_toolbar_joystick.tga      | Bin 0 -> 49 bytes
 .../default/xui/en-us/floater_toolbar_prefs.xml    |   1 +
 .../skins/default/xui/en-us/panel_toolbar.xml      |   5 +++++
 4 files changed, 8 insertions(+)
 create mode 100644 indra/newview/skins/default/textures/icn_toolbar_joystick.tga

diff --git a/indra/newview/llmenucommands.cpp b/indra/newview/llmenucommands.cpp
index 6df1d8717..ed0278f67 100644
--- a/indra/newview/llmenucommands.cpp
+++ b/indra/newview/llmenucommands.cpp
@@ -69,6 +69,7 @@
 #include "llfloaterhud.h"
 #include "llfloaterinspect.h"
 #include "llfloaterinventory.h"
+#include "llfloaterjoystick.h"
 #include "llfloaterlagmeter.h"
 #include "llfloaterland.h"
 #include "llfloaterlandholdings.h"
@@ -228,6 +229,7 @@ struct MenuFloaterDict : public LLSingleton<MenuFloaterDict>
 		registerFloater<LLFloaterMyFriends>				("groups", 1);
 		registerFloater<CommWrapper>					("im");
 		registerFloater<LLFloaterInspect>				("inspect");
+		registerFloater<LLFloaterJoystick>				("joystick");
 		registerFloater<LLFloaterLagMeter>				("lag meter");
 		registerFloater<SLFloaterMediaFilter>			("media filter");
 		registerFloater<LLFloaterMap>					("mini map");
diff --git a/indra/newview/skins/default/textures/icn_toolbar_joystick.tga b/indra/newview/skins/default/textures/icn_toolbar_joystick.tga
new file mode 100644
index 0000000000000000000000000000000000000000..49e5d11a21f391e18b563286837733b8990f34b7
GIT binary patch
literal 49
rcmZQz;9`IQMg~R(1rCP)|Np~87(#+VUBf(sJ^lT3BiuZFT=f_Lkxd94

literal 0
HcmV?d00001

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 d3ac8a2c2..9f3fc4f91 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
@@ -80,6 +80,7 @@
   <check_box bottom="-38" label="Favorites" name="favs_btn" follows="left|right" control_name="ToolbarVisibleInventoryFavs" left_delta="160"/>
   <check_box bottom_delta="-20" label="Outbox" name="outbox_btn" follows="left|right" control_name="ToolbarVisibleOutbox"/>
   <check_box bottom_delta="-20" label="Preferences" name="preferences_btn" follows="left|right" control_name="ToolbarVisiblePreferences"/>
+  <check_box bottom_delta="-20" label="Joystick Config" name="joystick_btn" follows="left|right" control_name="ToolbarVisibleJoystick"/>
   <check_box bottom_delta="-20" label="Autoreplace" name="auto_replace_btn" follows="left|right" control_name="ToolbarVisibleAutoReplace"/>
   <check_box bottom_delta="-20" label="Display Name" name="display_name_btn" follows="left|right" control_name="ToolbarVisibleDisplayName"/>
   <check_box bottom_delta="-20" label="Floater Test" name="floater_test_btn" follows="left|right" control_name="ToolbarVisibleTest"/>
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 c35dbfac2..55a94b5e2 100644
--- a/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
@@ -404,6 +404,11 @@
         <button.commit_callback function="ShowFloater" parameter="preferences"/>
       </button>
     </layout_panel>
+    <layout_panel name="paneljoystick" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleJoystick">
+      <button bottom="0" height="24" label="Joystick" name="joystick_btn" image_overlay="icn_toolbar_joystick.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="joystick"/>
+      </button>
+    </layout_panel>
     <layout_panel name="panelautoreplace" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleAutoReplace">
       <button bottom="0" height="24" label="Autoreplace" name="auto_replace_btn" image_overlay="icn_toolbar_auto_replace.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="autoreplace"/>