diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-08-19 16:01:20 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-08-19 16:01:20 +0100 |
| commit | 898dfdb52d24701bb2e51fd783c91721c0f5f40e (patch) | |
| tree | a16c783a4f49dd6be78aa3ac49782cbe0c9a3311 /indra/newview/llfloaterjoystick.cpp | |
| parent | 7e37263fc5cb93e31727b2e3243f2221ed1f8cad (diff) | |
| parent | e8b31d03b4f6f0ffb981b4ea150743daf7b4a958 (diff) | |
Merge remote-tracking branch 'origin/master' into SL-12995
Diffstat (limited to 'indra/newview/llfloaterjoystick.cpp')
| -rw-r--r-- | indra/newview/llfloaterjoystick.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llfloaterjoystick.cpp b/indra/newview/llfloaterjoystick.cpp index ee3d633dd0..2b672bc890 100644 --- a/indra/newview/llfloaterjoystick.cpp +++ b/indra/newview/llfloaterjoystick.cpp @@ -61,6 +61,11 @@ static LLTrace::SampleStatHandle<>* sJoystickAxes[6] = LLFloaterJoystick::LLFloaterJoystick(const LLSD& data) : LLFloater(data) { + if (!LLViewerJoystick::getInstance()->isJoystickInitialized()) + { + LLViewerJoystick::getInstance()->init(false); + } + initFromSettings(); } |