diff options
| author | Richard Linden <none@none> | 2013-09-26 11:34:15 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-26 11:34:15 -0700 |
| commit | 1733be96680e7ceb1911acc6af7fa3e12282fad7 (patch) | |
| tree | ad90c9eb2302a16fcaf3d888b4c58bc274361316 /indra/newview/llfloaterjoystick.cpp | |
| parent | 458990b435dabf0d9ad598920fdf9a3dd84e2f8e (diff) | |
| parent | 4db06820f0a89d480a3d5c49c26313a3bb78544d (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llfloaterjoystick.cpp')
| -rwxr-xr-x | indra/newview/llfloaterjoystick.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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) |