summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowmacosx.cpp
AgeCommit message (Collapse)Author
2024-05-15Merge branch 'main' into release/luau-scripting for Maint X release.Nat Goodspeed
2024-05-15Manual whitespace fixes (fix_whitespace.py).Nat Goodspeed
2024-05-01Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-mergeAndrey Lihatskiy
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵Andrey Lihatskiy
LF, and trim trailing whitespaces as needed
2024-04-01open folder support for macMaxim Nikolenko
2023-11-30Mac buildfixAndrey Lihatskiy
2023-11-30Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llvertexbuffer.cpp # indra/llui/llflatlistview.cpp # indra/newview/app_settings/settings.xml # indra/newview/lldrawpoolground.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorygallery.cpp # indra/newview/llspatialpartition.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewertexture.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/xui/en/menu_inventory.xml
2023-11-03DRTVWR-559 Fix for mac build.Dave Parks
2023-11-02SL-19979 Fix for frame stalls on mac with shadows enabled. Also fix ↵Dave Parks
multihreaded GL not working on mac (thanks, Rye!)
2023-10-23SL-13610 [MAC] Manufacturer based searchAndrey Kleshchev
2023-10-23SL-13610 [MAC] WIP filter out incompatible devicesAndrey Kleshchev
2023-10-23SL-13610 [MAC] WIP enable initing devices by local idAndrey Kleshchev
2023-10-23SL-13610 [MAC] WIP List HID available devices in joystick selectionAndrey Kleshchev
Doesn't filter the list yet, just shows full list of usb devices Selecting visible devices doesn't work yet
2023-04-26Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539Brad Linden
2023-03-29Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-03-20Merge branch 'DRTVWR-568' into DRTVWR-573-maint-RAndrey Lihatskiy
# Conflicts: # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/FindOpenJPEG.cmake # indra/cmake/OpenJPEG.cmake # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/newview/CMakeLists.txt
2023-02-03Merge branch 'main' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # doc/contributions.txt # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/FindOpenJPEG.cmake # indra/cmake/OpenJPEG.cmake # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/newview/CMakeLists.txt
2023-02-02Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2022-11-22Merge branch 'DRTVWR-568' into DRTVWR-539Mnikolenko Productengine
2022-10-29Fix use of deprecated CGDisplayAvailableModes with CGDisplayCopyAllDisplayModesRye Mutt
2022-10-29Fix RenderAppleUseMultGL debug setting for enabling threaded GL engineRye Mutt
2022-10-28Fix leak of copy and paste on macRye Mutt
2022-10-24Merge master into DRTVWR-568 (and fix conflicts)Callum Linden
2022-10-21Merge branch 'master' (DRTVWR-548) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llrendertarget.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloaterpreference.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewermenu.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp
2022-10-21Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # indra/newview/llfloaterpreference.cpp # indra/newview/llviewercontrol.cpp
2022-10-03SL-17541 simple fallback when refresh rate is unknownMaxim Nikolenko
2022-09-21Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
2022-09-16Merge branch master (DRTVWR-571) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h
2022-09-15Merge branch 'master' into DRTVWR-568Callum Linden
2022-09-15Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # indra/newview/llmodelpreview.h
2022-08-24DRTVWR-558: Eliminate many spurious set-not-used variables.Nat Goodspeed
With Xcode 13.4, these unused variables break Release builds.
2022-06-21SL-17635 remove unused variablesMaxim Nikolenko
2022-06-13SL-17485 - mac getVramSize should return all vram, not just ↵Howard Stearns
texture-specific, and use to compute getAvailableVRAMMegabytes.
2022-06-08SL-17541 show the message on macMnikolenko ProductEngine
2022-05-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llprimitive/llmodel.cpp # indra/llprimitive/llmodel.h # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h
2022-03-02Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py
2022-03-01Merge branch 'master' (DRTVWR-557) into DRTVWR-546Andrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py
2022-02-28Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/newview/llviewerregion.cpp
2022-02-08SL-16757 FIXED [Mac] third-person cursor doesn't return after switching away ↵Mnikolenko ProductEngine
from app and back
2021-11-17SL-16330 Allow vsync update without restart on macMnikolenko ProductEngine
2021-11-16DRTVWR-546 merge in master v6.5.1Dave Houlton
2021-11-16Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt
2021-11-09SL-16330 Clean up vertical sync handling, add to UIMnikolenko Productengine
2021-10-29SL-14664 Fix missed pixmap initAndrey Kleshchev
2021-10-11SL-16099 Multi-threaded OpenGL usage on Windows, enable Core Profile and ↵Dave Parks
VAOs by default.
2021-04-30Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-04-30Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt
2021-04-27SL-14664 Added zoomout and sizeallAndrey Kleshchev
Remade code to use getCursorFromString
2021-01-21SL-14720 FIXED Undo function is incorrect on German Mac keyboardMnikolenko ProductEngine
2020-07-20SL-13507 Viewer should log resolution of all associated displaysMnikolenko ProductEngine
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 13:41:50 +0000