diff options
| -rw-r--r-- | indra/llwindow/llwindowmacosx.cpp | 34 | ||||
| -rwxr-xr-x | indra/newview/llviewerparceloverlay.cpp | 2 |
2 files changed, 16 insertions, 20 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index 66b9a5d060..41665419aa 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -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 diff --git a/indra/newview/llviewerparceloverlay.cpp b/indra/newview/llviewerparceloverlay.cpp index d924bdb5fc..5a2b7e4c2f 100755 --- a/indra/newview/llviewerparceloverlay.cpp +++ b/indra/newview/llviewerparceloverlay.cpp @@ -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) |