diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2026-06-17 11:46:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-06-17 11:46:23 -0400 |
| commit | 34c308ebdb219c8c3e5cdc5a1192db8a51ef0c44 (patch) | |
| tree | b4323eb1fe5ac13ca6e5227a10056779e9f35b01 /indra/llwindow/llwindowmacosx.cpp | |
| parent | dace31455ca4b382f94a03d3c7c244d805bd85fd (diff) | |
macOS 27 build fixes + transition to UTType for file pickers (#5937)
* Get the viewer building on macOS 27
* Strip -mmacosx-version-min when we're below an SDK supported version.
Substitutes an actual SDK supported minimum version.
* Move kIOMainPortDefault behind an SDK compatibility check.
* Update llwindowmacosx_iokit.h
* Update llwindowmacosx_iokit.h
Diffstat (limited to 'indra/llwindow/llwindowmacosx.cpp')
| -rw-r--r-- | indra/llwindow/llwindowmacosx.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index f8920318d3..1dd795cd3a 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -44,7 +44,7 @@ #include <CoreGraphics/CGDisplayConfiguration.h> #include <IOKit/IOCFPlugIn.h> -#include <IOKit/IOKitLib.h> +#include "llwindowmacosx_iokit.h" #include <IOKit/IOMessage.h> #include <IOKit/hid/IOHIDUsageTables.h> #include <IOKit/hid/IOHIDLib.h> @@ -2379,7 +2379,7 @@ bool LLWindowMacOSX::getInputDevices(U32 device_type_filter, io_iterator_t io_iter = 0; // create an IO object iterator - result = IOServiceGetMatchingServices( kIOMasterPortDefault, device_dict_ref, &io_iter ); + result = IOServiceGetMatchingServices( kLLIOMainPort, device_dict_ref, &io_iter ); if ( kIOReturnSuccess != result ) { LL_WARNS("Joystick") << "IOServiceGetMatchingServices failed" << LL_ENDL; |