summaryrefslogtreecommitdiff
path: root/indra/llwindow
AgeCommit message (Collapse)Author
2025-07-03Merge tag 'Second_Life_Project#bca9ba9b-glTF_Mesh_Import' into gltf_mesh_importErik Kundiman
2025-07-03getCursorDelta isn't implemented if using SDL on WinErik Kundiman
2025-07-01Make Windows SDL-ready (in case we need to)Erik Kundiman
2025-06-26Disable direct input init on Win ARM64 for nowErik Kundiman
This would be for joysticks & spacemouses, which aren't that urgent. This is disabled as it seems to be causing a segmentation fault on Windows ARM64.
2025-06-10macOS 26 build changes (#4239)Jonathan "Geenz" Goodman
* Fix for VLAs now emitting warnings on Xcode 26, and AGL being removed from the SDK. Note: there was no warning or notice provided for AGL's removal. * Whitespace.
2025-06-03Exclude Windows from compiling SDL related filesErik Kundiman
2025-06-03Re-include GLEXT.cmake, but for Windows onlyErik Kundiman
There doesn't seem to be glext.h on Windows, so we'll just use the package from LL for now.
2025-06-03Revert "Promote seh_catcher() et al. to llexception.{h,cpp} for general use."Erik Kundiman
This reverts commit 71d777ea126e7f02cb46c11bdb606094ca06f75c.
2025-06-03Revert "Fix up llexception.h's cross-platform SEH wrapper."Erik Kundiman
This reverts commit 5ed8df22cd59680a685c4ada7daa5555bf59d4fe.
2025-06-02Revert "Stop trying to force OpenGL version on non-macOS"Erik Kundiman
This reverts commit fcdef29504a32ad85ce32c3d95ea8648aa169004. The moment 1 or 2 lines got removed, we lost core profile again.
2025-06-02Stop trying to force OpenGL version on non-macOSErik Kundiman
Turns out my old GPU is detected as complying only to 4.5 when on Linux. The fact that it's been detected as complying to 4.6 on FreeBSD this whole time, is quite ironic. I've only tested that the viewer runs with 4.6 without this on FreeBSD (the implication works), will test Linux distros next.
2025-05-29Merge branch 'main' into 2025.05Erik Kundiman
2025-05-29Merge branch '2025.04'Erik Kundiman
2025-05-29Fix GL init on Linux/SDL on various combinations of GPU driverRye Cogtail
2025-05-29Clean up more dead X11 code from SDL impl and modernize mouse capture with ↵Rye Cogtail
SDL_CaptureMouse
2025-05-28Merge branch 'main' into marchcat/2505-mergeAndrey Lihatskiy
# Conflicts: # .github/workflows/qatest.yaml # indra/llcommon/llsdutil.h # indra/llui/llflatlistview.h # indra/newview/llinventorybridge.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitgallery.h
2025-05-28Merge remote-tracking branch 'origin/main' into geenz/2025.04-to-developJonathan "Geenz" Goodman
2025-05-28Clean up old linux workaroundsRye Cogtail
2025-05-28Clean up SDL window creation and fix various bugsRye Cogtail
Add support for Core and Debug GL context creation Fix window position support Fix vsync handling Add minimum GL context support
2025-05-28Fix shutdown crash from failing to clean up SDL window properlyRye Cogtail
2025-05-28Clean up SDL window event handling and implement missing functionalityRye Cogtail
Horizontal Scrollwheels Proper extra mouse button handling SDL native double click handling
2025-05-28Implement various missing functions and callbacks in SDL window backendRye Cogtail
2025-05-28Update SDL clipboard, icon flash, and url opening handlers to use native SDL ↵Rye Cogtail
functions
2025-05-28Fix name of vsync param in LLWindowSDL (#2502)Ansariel Hiller
2025-05-28Fix trailing whitespaceAndrey Lihatskiy
2025-05-28Post merge cleanup of Linux codeNicky
2025-05-22Merge branch 'main' into 2025.04Erik Kundiman
2025-05-13Not rely on (LL_)USESYSTEMLIBS macro & CMake settingErik Kundiman
but the fact that we keep on using as many system libraries as we can (and only resort to other sources in certain cases), hasn't changed, of course. Also stop having to set USE_AUTOBUILD_3P to OFF. Lines are reindented, and when a system library can be found for a dependency, then that should be the way. If later we find out that using some other way is better, than stick to that. So, one option at a time, whichever is best for the situation. GLEXT hasn't been used, and in order to be not having to hack its .cmake file, we bypass it and refer to GLH (which is still used) right away in LLWindow. CMake commands that need to be bypassed, if it's a one-liner then it's just commented out, but if it's multiple lines, then scope them with if (FALSE) to minimise difference.
2025-05-05#3317 Fix full screen issue with Windows 11 24H2Andrey Kleshchev
2025-04-19Merge tag 'Second_Life_Release#11cd9b9-2025.05' into 2025.05Erik Kundiman
2025-04-19Merge tag 'Second_Life_Release#9a333e65-2025.04' into 2025.04Erik Kundiman
2025-04-18Merge develop into release/2025.04Andrey Kleshchev
2025-04-15Merge branch 'release/2025.04' into rye/forevermacJonathan "Geenz" Goodman
2025-04-15Merge branch 'main' into marchcat/maint-c-restoreAndrey Lihatskiy
# Conflicts: # indra/llcommon/lldate.h # indra/newview/llappviewer.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llmaterialeditor.cpp # indra/newview/llviewerparceloverlay.cpp # indra/newview/llvoavatar.cpp
2025-04-12Refactor LLWindowWin32::LLWindowWin32Thread::wakeAndDestroy()Andrey Lihatskiy
Key improvements: 1. Better error handling for thread detachment 2. More careful sequencing of operations 3. Ensuring the window is hidden before proceeding with other shutdown steps 4. Proper checking of thread joinability before detaching
2025-04-11Fix more merge issues:Ansariel
* Re-apply changes from a620e58daccf92b5b8d61347312739720ed2b51a * Fix duplicate code resulting from 826236f1bc065fba257d7954d11ac98c59493445 # Conflicts: # indra/llwindow/llwindowwin32.cpp
2025-04-10Fix merge issues:Ansariel
* Restore changes from 21947778baaca205615a71a97ac8f563c998fdd3 to llwindow/llwindowwin32.cpp * Restore changes from 3758618949684641fc94b5c9478d9002706213cc to newview/llinspecttexture.cpp * Fix apparent merge error in LLInventoryPanel::itemChanged * Restore changes from 1eeecfa1a8bf43a8980217ce34e3b5f4458483e0 in newview/llpaneloutfitsinventory.h * Restore changes from b9633c17e373bfe55b29228996e8473eb041466d in newview/llpaneloutfitsinventory.h & newview/llpanelwearing.cpp * Restore changes from f660f1f0fda4d2363d351fa550b4f8818b46c2c3 in newview/llviewertexture.cpp * Restore changes from b9633c17e373bfe55b29228996e8473eb041466d & 98f7d73d46fdc045759023eda6409e8c791f5cb2 in newview/lloutfitgallery.cpp and newview/lloutfitslist.cpp * Replace changes from 23729442aab7130f3368d433e8a5a9dd45ff6b98 with current implementation in develop branch * Fix more broken changes in LLViewerTexture::saveRawImage * Restore the changes in LLMath both from develop and maint-c * Fix all kind of other merge errors # Conflicts: # indra/llmath/v2math.h # indra/llmath/v3math.h # indra/llui/llfolderviewitem.cpp # indra/llwindow/llwindowwin32.cpp # indra/newview/llfloaterobjectweights.h # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitslist.cpp # indra/newview/llsidepaneliteminfo.cpp # indra/newview/llvoavatar.cpp
2025-04-10Post-merge cleanup: llwindowwin32.cppAndrey Lihatskiy
2025-04-10Merge commit '9e24b30' into marchcat/maint-c/restoreAndrey Lihatskiy
# Conflicts: # indra/llmath/v2math.cpp # indra/llmath/v2math.h # indra/llmath/v3math.h # indra/llmath/v4math.h # indra/llui/llfolderviewitem.cpp # indra/llui/llfolderviewitem.h # indra/llui/llfolderviewmodel.h # indra/llui/llmodaldialog.cpp # indra/llui/lltexteditor.cpp # indra/llui/lltexteditor.h # indra/llwindow/llwindowwin32.cpp # indra/newview/llagent.cpp # indra/newview/llagentcamera.h # indra/newview/llavatarrenderinfoaccountant.cpp # indra/newview/llconversationmodel.h # indra/newview/llfloaterinventorysettings.cpp # indra/newview/llfloaternamedesc.cpp # indra/newview/llfloaternamedesc.h # indra/newview/llfloaterobjectweights.cpp # indra/newview/llfloaterobjectweights.h # indra/newview/llfolderviewmodelinventory.h # indra/newview/llinspecttexture.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventorygallery.h # indra/newview/llinventorygallerymenu.cpp # indra/newview/llinventorymodel.cpp # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h # indra/newview/llmaterialeditor.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitgallery.h # indra/newview/lloutfitslist.cpp # indra/newview/lloutfitslist.h # indra/newview/llpanelgroupcreate.cpp # indra/newview/llpanelgroupgeneral.cpp # indra/newview/llpanelobjectinventory.cpp # indra/newview/llpaneloutfitsinventory.h # indra/newview/llpanelprofile.cpp # indra/newview/llpanelwearing.cpp # indra/newview/llreflectionmap.cpp # indra/newview/llselectmgr.cpp # indra/newview/llsidepanelappearance.cpp # indra/newview/llsidepaneliteminfo.cpp # indra/newview/llteleporthistorystorage.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/lltexturefetch.cpp # indra/newview/lltexturefetch.h # indra/newview/llviewerassetupload.cpp # indra/newview/llviewercamera.cpp # indra/newview/llviewercamera.h # indra/newview/llviewermenufile.cpp # indra/newview/llviewerobject.h # indra/newview/llviewertexture.cpp # indra/newview/llviewerwindow.cpp # indra/newview/llvoavatar.cpp # indra/newview/llvoavatar.h # indra/newview/llvoavatarself.cpp # indra/newview/llvovolume.cpp # indra/newview/llvovolume.h # indra/newview/tests/llviewerassetstats_test.cpp
2025-04-09Merge tag 'Second_Life_Release#632a8648-2025.03' into 2025.03Erik Kundiman
2025-04-08#3892 Crash at fillCompositionLogfontAndrey Kleshchev
2025-04-05#3575 Adjust VRAM budget test a bitAndrey Kleshchev
2025-04-05#3575 Clean up obsolete VRAM detectin logicAndrey Kleshchev
2025-04-01#3712 CMakeFindFrameworks deprecationAndrey Kleshchev
2025-03-29Merge tag 'Second_Life_Release#8eff224c-2025.03' into 2025.03Erik Kundiman
2025-03-25#3795 Fix macos shutdown crashAndrey Kleshchev
2025-03-16Performance tweaks related to glErrormobserveur
Disabling glGetError() calls in release build
2025-03-05Merge remote-tracking branch 'secondlife/release/2024.12-ForeverFPS' into ↵Erik Kundiman
2024.12-ForeverFPS
2025-02-18Merge commit '0679cbdec89fbd3ec470768bdf469f6a1d326859' into tmpErik Kundiman
2025-02-13Fix xcode16 build errorsAndrey Lihatskiy
generated by cgit v1.3 (git 2.53.0) at 2026-03-22 00:00:37 +0000