diff options
| author | Richard Nelson <none@none> | 2010-07-30 10:07:14 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-07-30 10:07:14 -0700 |
| commit | 50005b81f7788cd7a372ab3009568bdb9e024a6e (patch) | |
| tree | 829bd18ebb1ec90234973a980979ca92cebe38ff /indra/newview/llfloaterjoystick.cpp | |
| parent | 2051ba7248f11af083bbda9cd8b67be99d0d844b (diff) | |
| parent | 9b526997d93d9290602a86f91a7f096da4395d97 (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 78bc63ac8c..9c7957603e 100644 --- a/indra/newview/llfloaterjoystick.cpp +++ b/indra/newview/llfloaterjoystick.cpp @@ -58,11 +58,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++) |