From 4db06820f0a89d480a3d5c49c26313a3bb78544d Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 26 Sep 2013 11:34:07 -0700
Subject: fix for display of joystick statbar monitors

---
 indra/newview/llfloaterjoystick.cpp                     | 10 +++++-----
 indra/newview/skins/default/xui/en/floater_joystick.xml |  5 +++++
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloaterjoystick.cpp b/indra/newview/llfloaterjoystick.cpp
index adcecbbb7a..b7fff6cae3 100755
--- a/indra/newview/llfloaterjoystick.cpp
+++ b/indra/newview/llfloaterjoystick.cpp
@@ -42,20 +42,20 @@
 #include "llviewerjoystick.h"
 #include "llcheckboxctrl.h"
 
-static LLTrace::SampleStatHandle<>	sJoystickAxis1("Joystick axis 1"),
+static LLTrace::SampleStatHandle<>	sJoystickAxis0("Joystick axis 0"),
+									sJoystickAxis1("Joystick axis 1"),
 									sJoystickAxis2("Joystick axis 2"),
 									sJoystickAxis3("Joystick axis 3"),
 									sJoystickAxis4("Joystick axis 4"),
-									sJoystickAxis5("Joystick axis 5"),
-									sJoystickAxis6("Joystick axis 6");
+									sJoystickAxis5("Joystick axis 5");
 static LLTrace::SampleStatHandle<>* sJoystickAxes[6] = 
 {
+	&sJoystickAxis0,
 	&sJoystickAxis1,
 	&sJoystickAxis2,
 	&sJoystickAxis3,
 	&sJoystickAxis4,
-	&sJoystickAxis5,
-	&sJoystickAxis6
+	&sJoystickAxis5
 };
 
 LLFloaterJoystick::LLFloaterJoystick(const LLSD& data)
diff --git a/indra/newview/skins/default/xui/en/floater_joystick.xml b/indra/newview/skins/default/xui/en/floater_joystick.xml
index 59f6a9434c..ca165d1a29 100755
--- a/indra/newview/skins/default/xui/en/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/en/floater_joystick.xml
@@ -208,6 +208,7 @@
         <stat_bar
          bar_max="2"
          bar_min="-2"
+				 show_bar="true"
          height="0"
          label="Axis 0"
          label_spacing="1"
@@ -220,6 +221,7 @@
         <stat_bar
          bar_max="2"
          bar_min="-2"
+				 show_bar="true"
          label="Axis 1"
          label_spacing="1"
          layout="topleft"
@@ -228,6 +230,7 @@
         <stat_bar
          bar_max="2"
          bar_min="-2"
+				 show_bar="true"
          label="Axis 2"
          label_spacing="1"
          layout="topleft"
@@ -236,6 +239,7 @@
         <stat_bar
          bar_max="2"
          bar_min="-2"
+				 show_bar="true"
          label="Axis 3"
          label_spacing="1"
          layout="topleft"
@@ -244,6 +248,7 @@
         <stat_bar
          bar_max="2"
          bar_min="-2"
+				 show_bar="true"
          label="Axis 4"
          label_spacing="1"
          layout="topleft"
-- 
cgit v1.2.3