diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-09-04 17:00:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-04 17:00:08 +0300 |
| commit | 206bdc90de1cbb68f78df74c1b6cf6426522ef79 (patch) | |
| tree | 27f2d17c397bbebc1a1071248b63dc6d33a43cb7 /indra/newview/llfloaterjoystick.h | |
| parent | a65bc46b138b89200586b29fe729cbc7b0f0c8c4 (diff) | |
| parent | e5bcd6f50a8247dde1121210150835d968dc214d (diff) | |
Merge pull request #2494 from secondlife/marchcat/b-develop
Maint B sync
Diffstat (limited to 'indra/newview/llfloaterjoystick.h')
| -rw-r--r-- | indra/newview/llfloaterjoystick.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloaterjoystick.h b/indra/newview/llfloaterjoystick.h index e304431153..c7e727635d 100644 --- a/indra/newview/llfloaterjoystick.h +++ b/indra/newview/llfloaterjoystick.h @@ -39,7 +39,7 @@ class LLFloaterJoystick : public LLFloater public: - virtual BOOL postBuild(); + virtual bool postBuild(); virtual void refresh(); virtual void apply(); // Apply the changed values. virtual void cancel(); // Cancel the changed values. @@ -95,6 +95,8 @@ private: LLComboBox *mJoysticksCombo; bool mHasDeviceList; + bool mJoystickInitialized; + LLUUID mCurrentDeviceId; // stats view LLStatBar* mAxisStatsBar[6]; |