diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-19 22:37:41 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-19 22:37:41 +0300 |
| commit | aaaf3189c400e491c6adc533f8b03dfecddb1dd9 (patch) | |
| tree | 57872267bb777945a568574ee19bcda578738d76 /indra/newview/llfloaterjoystick.cpp | |
| parent | 847cce915dd54166ca3b4fd6bfb8b3c697433abf (diff) | |
| parent | b86fdf1c316a49bab69d7ef6b3751565bedf8f59 (diff) | |
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
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(); } |