livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-13610 build fix

master
Mnikolenko Productengine 2023-10-23 16:08:46 +03:00
parent 3084f86417
commit 92f2cf6089
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llwindow/llwindowwin32.cpp
View File

@ -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<bool(std::string&, LLSD&, void*)> osx_callback,
void * di8_devices_callback,
void* userdata)

2
indra/newview/llviewerjoystick.cpp
View File

@ -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);