summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerjoystick.h
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-12-14 19:41:07 +0200
committerakleshchev <117672381+akleshchev@users.noreply.github.com>2023-10-23 15:26:19 +0300
commit9b27b6e5098aee7a050d4c3f3f14050c509f74ec (patch)
tree93863e039186d271d3a91247f8e2abf2b8d15125 /indra/newview/llviewerjoystick.h
parent702e4c7dc1a383f83a0324e97b087efef82e9248 (diff)
SL-13610 [MAC] WIP List HID available devices in joystick selection
Doesn't filter the list yet, just shows full list of usb devices Selecting visible devices doesn't work yet
Diffstat (limited to 'indra/newview/llviewerjoystick.h')
-rw-r--r--indra/newview/llviewerjoystick.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewerjoystick.h b/indra/newview/llviewerjoystick.h
index 3b4f898710..49f8c8eabf 100644
--- a/indra/newview/llviewerjoystick.h
+++ b/indra/newview/llviewerjoystick.h
@@ -103,7 +103,11 @@ private:
bool mCameraUpdated;
bool mOverrideCamera;
U32 mJoystickRun;
- LLSD mLastDeviceUUID; // _GUID as U8 binary map, integer 1 for no device/ndof's device
+
+ // Windows: _GUID as U8 binary map
+ // MacOS: long as an U8 binary map
+ // Else: integer 1 for no device/ndof's default device
+ LLSD mLastDeviceUUID;
static F32 sLastDelta[7];
static F32 sDelta[7];