diff options
| author | Richard Linden <none@none> | 2012-08-24 16:31:29 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-08-24 16:31:29 -0700 |
| commit | 93578f7e519026ca286f54595c3b10d3926e0db3 (patch) | |
| tree | 8729fc04887b6d91f67f5e6b4284a3d9d18d8dce /indra/newview/llfloaterjoystick.cpp | |
| parent | e6dc88241b58ebc1f05f96279f1f189b1d5e8885 (diff) | |
| parent | af8653d7598418e929718ede6742589719ffb2fb (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-cat
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]) |