diff options
author | Jacek Antonelli | 2008-09-28 17:21:23 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-09-28 17:21:46 -0500 |
commit | 31e7c77a411d94bc87f0232588b339149bb29a49 (patch) | |
tree | 49e487700e91713e620e4d33f20b7f7afb5a2fa9 /linden/indra/newview/llfloaterjoystick.cpp | |
parent | Second Life viewer sources 1.21.2-RC (diff) | |
download | meta-impy-31e7c77a411d94bc87f0232588b339149bb29a49.zip meta-impy-31e7c77a411d94bc87f0232588b339149bb29a49.tar.gz meta-impy-31e7c77a411d94bc87f0232588b339149bb29a49.tar.bz2 meta-impy-31e7c77a411d94bc87f0232588b339149bb29a49.tar.xz |
Second Life viewer sources 1.21.3-RC
Diffstat (limited to 'linden/indra/newview/llfloaterjoystick.cpp')
-rw-r--r-- | linden/indra/newview/llfloaterjoystick.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloaterjoystick.cpp b/linden/indra/newview/llfloaterjoystick.cpp index e646eb5..172da1d 100644 --- a/linden/indra/newview/llfloaterjoystick.cpp +++ b/linden/indra/newview/llfloaterjoystick.cpp | |||
@@ -58,7 +58,7 @@ void LLFloaterJoystick::draw() | |||
58 | childSetEnabled("enable_joystick", joystick_inited); | 58 | childSetEnabled("enable_joystick", joystick_inited); |
59 | childSetEnabled("joystick_type", joystick_inited); | 59 | childSetEnabled("joystick_type", joystick_inited); |
60 | std::string desc = LLViewerJoystick::getInstance()->getDescription(); | 60 | std::string desc = LLViewerJoystick::getInstance()->getDescription(); |
61 | if (desc.empty()) desc = getUIString("NoDevice"); | 61 | if (desc.empty()) desc = getString("NoDevice"); |
62 | childSetText("joystick_type", desc); | 62 | childSetText("joystick_type", desc); |
63 | 63 | ||
64 | LLViewerJoystick* joystick(LLViewerJoystick::getInstance()); | 64 | LLViewerJoystick* joystick(LLViewerJoystick::getInstance()); |
@@ -83,8 +83,8 @@ void LLFloaterJoystick::draw() | |||
83 | BOOL LLFloaterJoystick::postBuild() | 83 | BOOL LLFloaterJoystick::postBuild() |
84 | { | 84 | { |
85 | F32 range = gSavedSettings.getBOOL("Cursor3D") ? 1024.f : 2.f; | 85 | F32 range = gSavedSettings.getBOOL("Cursor3D") ? 1024.f : 2.f; |
86 | LLUIString axis = getUIString("Axis"); | 86 | LLUIString axis = getString("Axis"); |
87 | LLUIString joystick = getUIString("JoystickMonitor"); | 87 | LLUIString joystick = getString("JoystickMonitor"); |
88 | 88 | ||
89 | // use this child to get relative positioning info; we'll place the | 89 | // use this child to get relative positioning info; we'll place the |
90 | // joystick monitor on its right, vertically aligned to it. | 90 | // joystick monitor on its right, vertically aligned to it. |