aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterjoystick.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llfloaterjoystick.cpp6
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()
83BOOL LLFloaterJoystick::postBuild() 83BOOL 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.