diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-25 15:58:08 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-25 15:58:08 +0100 |
commit | 1d89a80ba7293309fd4fbdd03b802c5c2998aac7 (patch) | |
tree | 70eb3619b9a3df35687836d9daa328eb52ba85ab /indra/newview/llfloaterjoystick.cpp | |
parent | 6fcde580c3a2e6cc62bfab52bd47cae8726c56d4 (diff) | |
parent | e416840f85dc4a367894036b9fe483f17d959c54 (diff) |
merge
Diffstat (limited to 'indra/newview/llfloaterjoystick.cpp')
-rw-r--r-- | indra/newview/llfloaterjoystick.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloaterjoystick.cpp b/indra/newview/llfloaterjoystick.cpp index cc1958b396..e1994bb8bc 100644 --- a/indra/newview/llfloaterjoystick.cpp +++ b/indra/newview/llfloaterjoystick.cpp @@ -52,11 +52,11 @@ LLFloaterJoystick::LLFloaterJoystick(const LLSD& data) void LLFloaterJoystick::draw() { bool joystick_inited = LLViewerJoystick::getInstance()->isJoystickInitialized(); - childSetEnabled("enable_joystick", joystick_inited); - childSetEnabled("joystick_type", joystick_inited); + getChildView("enable_joystick")->setEnabled(joystick_inited); + getChildView("joystick_type")->setEnabled(joystick_inited); std::string desc = LLViewerJoystick::getInstance()->getDescription(); if (desc.empty()) desc = getString("NoDevice"); - childSetText("joystick_type", desc); + getChild<LLUICtrl>("joystick_type")->setValue(desc); LLViewerJoystick* joystick(LLViewerJoystick::getInstance()); for (U32 i = 0; i < 6; i++) |