diff options
author | Richard Linden <none@none> | 2012-08-07 19:56:59 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2012-08-07 19:56:59 -0700 |
commit | af8653d7598418e929718ede6742589719ffb2fb (patch) | |
tree | 2744b56414fc48db5661ee11ce48ac5e8a26f021 /indra/newview/llfloaterjoystick.cpp | |
parent | 03dd09b1620b8331529f6aae742b2d341c29ce0d (diff) | |
parent | c8a36e9cfd1e90a1aa385667c7272c25e2ef9136 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llfloaterjoystick.cpp')
-rw-r--r-- | indra/newview/llfloaterjoystick.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloaterjoystick.cpp b/indra/newview/llfloaterjoystick.cpp index c37798c330..d0c22d25f2 100644 --- a/indra/newview/llfloaterjoystick.cpp +++ b/indra/newview/llfloaterjoystick.cpp @@ -33,6 +33,7 @@ #include "llerror.h" #include "llrect.h" #include "llstring.h" +#include "llstat.h" // project includes #include "lluictrlfactory.h" @@ -83,7 +84,8 @@ BOOL LLFloaterJoystick::postBuild() for (U32 i = 0; i < 6; i++) { - mAxisStats[i] = new LLStat(4); + std::string stat_name(llformat("Joystick axis %d", i)); + mAxisStats[i] = new LLStat(stat_name, 4); std::string axisname = llformat("axis%d", i); mAxisStatsBar[i] = getChild<LLStatBar>(axisname); if (mAxisStatsBar[i]) |