diff options
| author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2020-05-14 07:51:08 +0000 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2020-05-14 07:51:08 +0000 |
| commit | ebc629ffc45e7d1cf66e3f98ee4ca90dea18af33 (patch) | |
| tree | 04f20f811c0d0d52dbb07336e7db8a94d9555cb2 /indra | |
| parent | 663489493edd722f368007148814e9163668cdd2 (diff) | |
Merged in SL-12090 (pull request #105)
SL-12090 Initialize the joystick only when required
* SL-12090 Initialize the joystick only when required
Approved-by: Andrey Kleshchev
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llfloaterjoystick.cpp | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 0593ad1003..5630bb1a3f 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1126,7 +1126,10 @@ bool LLAppViewer::init() gSimLastTime = gRenderStartTime.getElapsedTimeF32(); gSimFrames = (F32)gFrameCount; - LLViewerJoystick::getInstance()->init(false); + if (gSavedSettings.getBOOL("JoystickEnabled")) + { + LLViewerJoystick::getInstance()->init(false); + } try { initializeSecHandler(); 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(); } |