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

Mac buildfix

master
Andrey Lihatskiy 2023-11-30 13:54:39 +02:00
parent 27dae1d967
commit 8b9c44b215
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
indra/llwindow/llwindowmacosx.cpp
View File

@ -2246,29 +2246,27 @@ static void get_devices(std::list<HidDevice> &list_of_devices,
{
HidDevice device = populate_device( io_obj );
if (debugLoggingEnabled("Joystick"))
// Should match ndof
if (device.mAxis >= 3
|| (device.mUsagePage == kHIDPage_GenericDesktop
&& (device.mUsage == kHIDUsage_GD_MultiAxisController
|| device.mUsage == kHIDUsage_GD_GamePad
|| device.mUsage == kHIDUsage_GD_Joystick))
|| (device.mUsagePage == kHIDPage_Game
&& device.mUsage == kHIDUsage_Game_3DGameController)
|| strstr(device.mManufacturer, "3Dconnexion"))
{
list_of_devices.push_back(device);
LL_DEBUGS("Joystick") << "Device axises: " << (S32)device.mAxis
<< "Device HIDUsepage: " << (S32)device.mUsagePage
<< "Device HIDUsage: " << (S32)device.mUsage
<< LL_ENDL;
}
else
{
// Should match ndof
if (device.mAxis >= 3
|| (device.mUsagePage == kHIDPage_GenericDesktop
&& (device.mUsage == kHIDUsage_GD_MultiAxisController
|| device.mUsage == kHIDUsage_GD_GamePad
|| device.mUsage == kHIDUsage_GD_Joystick))
|| (device.mUsagePage == kHIDPage_Game
&& device.mUsage == kHIDUsage_Game_3DGameController)
|| strstr(device.mManufacturer, "3Dconnexion"))
{
list_of_devices.push_back(device);
}
}
LL_DEBUGS("Joystick");
list_of_devices.push_back(device);
LL_CONT << "Device axes: " << (S32)device.mAxis
<< " Device HIDUsepage: " << (S32)device.mUsagePage
<< " Device HIDUsage: " << (S32)device.mUsage;
LL_ENDL;
}
// release the device object, it is no longer needed

2
indra/newview/llviewerparceloverlay.cpp
View File

@ -51,8 +51,6 @@
static const U8 OVERLAY_IMG_COMPONENTS = 4;
static const S32 FLOATS_PER_VERTEX = LENGTHOFVECTOR3;
static const S32 BYTES_PER_COLOR = LENGTHOFCOLOR4U;
static const F32 LINE_WIDTH = 0.0625f;
LLViewerParcelOverlay::LLViewerParcelOverlay(LLViewerRegion* region, F32 region_width_meters)