From 92f2cf60896e0beb65ab5faaf6894b683121cdbe Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Mon, 23 Oct 2023 16:08:46 +0300 Subject: SL-13610 build fix --- indra/llwindow/llwindowwin32.cpp | 2 +- indra/newview/llviewerjoystick.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 60bd3b080d..694f010ef3 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -4495,7 +4495,7 @@ void* LLWindowWin32::getDirectInput8() return &gDirectInput8; } -bool LLWindowWin32::getInputDevices(U32 device_type_filter +bool LLWindowWin32::getInputDevices(U32 device_type_filter, std::function osx_callback, void * di8_devices_callback, void* userdata) diff --git a/indra/newview/llviewerjoystick.cpp b/indra/newview/llviewerjoystick.cpp index ef96ea4493..4577f71061 100644 --- a/indra/newview/llviewerjoystick.cpp +++ b/indra/newview/llviewerjoystick.cpp @@ -1446,7 +1446,7 @@ void LLViewerJoystick::saveDeviceIdToSettings() // someone editing the xml will corrupt it // so convert to string first std::string device_string = getDeviceUUIDString(); - gSavedSettings.setLLSD("JoystickDeviceUUID", LLSD(device_string); + gSavedSettings.setLLSD("JoystickDeviceUUID", LLSD(device_string)); #else LLSD device_id = getDeviceUUID(); gSavedSettings.setLLSD("JoystickDeviceUUID", device_id); -- cgit v1.2.3