diff options
| author | Dave Parks <davep@lindenlab.com> | 2024-05-07 09:47:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-07 09:47:37 -0500 |
| commit | 155ddf23363f1d5c534c69f50505faf67e51948f (patch) | |
| tree | 976912ed4fa3bc2af7b0b68201460f08614748b5 /indra/newview/llviewerjoystick.cpp | |
| parent | f79548ec68ebcef8f8f83705b65fd59da43c3e26 (diff) | |
| parent | f9473e8afcb624cc1b101195bf15943ec372b56f (diff) | |
Merge pull request #1421 from secondlife/DRTVWR-600-maint-A
Drtvwr 600 maint a
Diffstat (limited to 'indra/newview/llviewerjoystick.cpp')
| -rw-r--r-- | indra/newview/llviewerjoystick.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerjoystick.cpp b/indra/newview/llviewerjoystick.cpp index a53b8ebd88..0aba982ba9 100644 --- a/indra/newview/llviewerjoystick.cpp +++ b/indra/newview/llviewerjoystick.cpp @@ -342,7 +342,7 @@ void LLViewerJoystick::init(bool autoenable) loadDeviceIdFromSettings(); - if (libinit == false) + if (!libinit) { // Note: The HotPlug callbacks are not actually getting called on Windows if (ndof_libinit(HotPlugAddCallback, @@ -401,10 +401,10 @@ void LLViewerJoystick::init(bool autoenable) // Autoenable the joystick for recognized devices if nothing was connected previously if (!autoenable) { - autoenable = gSavedSettings.getString("JoystickInitialized").empty() ? true : false; + autoenable = gSavedSettings.getString("JoystickInitialized").empty(); } updateEnabled(autoenable); - + if (mDriverState == JDS_INITIALIZED) { // A Joystick device is plugged in |