summaryrefslogtreecommitdiff
path: root/indra/llwindow
AgeCommit message (Collapse)Author
2024-11-11Merge branch 'develop' into marchcat/c-developAndrey Lihatskiy
# Conflicts: # indra/newview/llvoavatar.cpp
2024-11-06Improve Tracy OpenGL integrationRye
Fix memory profiling when gpu profiling enabled Fix disabling renderdoc support
2024-10-31Fix broken viewer under XWayland and whitespaceRye
2024-10-31Introduce NFDE file picker support for linux and SDLRye Cogtail
2024-10-28Merge branch 'develop' into marchcat/c-developAndrey Lihatskiy
# Conflicts: # indra/llwindow/llwindowwin32.cpp # indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
2024-10-24Merge pull request #2890 from secondlife/leviathan/disable-sdl2-on-macAndrew Meadows
temporary workaround for #2870: disable SDL2 on mac
2024-10-22Merge branch 'develop' into marchcat/xcode-16Nat Goodspeed
2024-10-18temporary workaround for #2870: disable SDL2 on macleviathan
2024-10-17Resolve maint-c post merge shutdown issue #2Andrey Kleshchev
2024-10-17Resolve maint-c post merge shutdown issue (#2872)Andrey Kleshchev
2024-10-16Remove dependency on libwayland-dev (#2865)AiraYumi
2024-10-15Fix more merge issues:Ansariel
* Re-apply changes from a620e58daccf92b5b8d61347312739720ed2b51a * Fix duplicate code resulting from 826236f1bc065fba257d7954d11ac98c59493445
2024-10-15Fix 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
2024-10-15Post-merge cleanup: llwindowwin32.cppAndrey Lihatskiy
2024-10-13Merge branch 'release/maint-c' into marchcat/c-developAndrey Lihatskiy
# Conflicts: # indra/llwindow/llwindowwin32.cpp # indra/newview/llappviewer.cpp # indra/newview/llfloaterinventorysettings.cpp # indra/newview/llinventoryfunctions.cpp # indra/newview/llteleporthistorystorage.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/llviewerparceloverlay.cpp
2024-10-13Remove traces of FLTK (#2834)Ansariel Hiller
2024-10-12Merge commit '18f23d9a55' into marchcat/c-developAndrey Lihatskiy
# Conflicts: # indra/llwindow/llwindowwin32.cpp # indra/newview/llagent.cpp # indra/newview/llavatarrenderinfoaccountant.cpp # indra/newview/llcontrolavatar.cpp # indra/newview/llinspecttexture.cpp # indra/newview/llviewertexture.cpp # indra/newview/llviewerwindow.cpp # indra/newview/llvoavatar.cpp # indra/newview/llvoavatar.h # indra/newview/llvoavatarself.cpp # indra/newview/llvovolume.cpp
2024-10-10Implement the groundwork for wayland support. (#2803)Nicky Dasmijn
During compile time try to detect libwayland-client-dev is installed, - If yes, compile a viewer which can run and start under wayland. libwayland-client is needed to detect if the viewer is hidden/minimized. - if no, disable wayland support and refuse to start the viewer under wayland (xwayland is okay). To not introduce a hard link dependency on libwayland-client.so the object will be loaded dynamically if needed.
2024-10-08Merge branch 'develop' into marchcat/xcode-16Andrey Lihatskiy
# Conflicts: # .github/workflows/build.yaml # indra/llmath/raytrace.cpp
2024-10-04Merge remote-tracking branch 'origin/develop' into leviathan/game-controlBrad Linden
2024-10-04repair rebase: remove duplicate SDL initializationAndrew Meadows
2024-10-04Merge remote branch 'develop' into marchcat/xcode-16Nat Goodspeed
2024-10-03fix GameControl save settings, fix linux buildAndrew Meadows
2024-10-03Fix GL init on Linux/SDL on various combinations of GPU driverRye Cogtail
2024-10-03remove crashy LLSD ctor used by GameControlleviathan
2024-10-03more correct application of GameControl prefsleviathan
2024-10-03even more correct GameControl feature-flag switchleviathan
2024-10-03put GameControl behind a feature flagleviathan
2024-10-03Add GameControl UI for per device settingsAlexander Gavriliuk
2024-10-03more GameControl prefs UIleviathan
2024-10-03avatar_motion-->GameControl translation and flycamLeviathan Linden
2024-10-03add GameControl feature and SDL2 dependencyLeviathan Linden
2024-10-02Clean up LLUI and fix/add suggestions from VS (#2746)Ansariel Hiller
2024-10-01Clean up more dead X11 code from SDL impl and modernize mouse capture with ↵Rye Cogtail
SDL_CaptureMouse
2024-09-29Clean up old linux workaroundsRye Cogtail
2024-09-29Clean 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
2024-09-29Fix shutdown crash from failing to clean up SDL window properlyRye Cogtail
2024-09-29Clean up SDL window event handling and implement missing functionaiotyRye Cogtail
Horizontal Scrollwheels Proper extra mouse button handling SDL native double click handling
2024-09-29Implement various missing functions and callbacks in SDL window backendRye Cogtail
2024-09-28Update SDL clipboard, icon flash, and url opening handlers to use native SDL ↵Rye Cogtail
functions
2024-09-25Merge branch 'develop' into marchcat/xcode-16Nat Goodspeed
2024-09-23Merge remote branch 'develop' into release/luau-scripting for Maint BNat Goodspeed
2024-09-23Merge branch 'develop' into marchcat/b-developAndrey Lihatskiy
# Conflicts: # indra/newview/llfeaturemanager.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvoicewebrtc.cpp
2024-09-23Merge remote branch 'develop'into release/luau-scriptingNat Goodspeed
2024-09-19Merge branch 'main' into marchcat/b-main-syncAndrey Lihatskiy
# Conflicts: # indra/newview/llviewertexturelist.cpp
2024-09-18Avoid LL_ERRS when wgl_ARB_pixel_format is not supported (#2606)Brad Linden
secondlife/viewer#2599
2024-09-17Xcode16 build fixAndrey Lihatskiy
2024-09-13Clean up Windows build (#2562)Ansariel Hiller
* APR_DECLARE_STATIC and APU_DECLARE_STATIC gets already defined in APR.cmake * Move both _CRT_SECURE_NO_WARNINGS and _WINSOCK_DEPRECATED_NO_WARNINGS definitions to 00-Common.cmake * Always define WIN32_LEAN_AND_MEAN and include subset of Windows API by default * Remove llwin32headerslean.h and remove unnecessary WIN32_LEAN_AND_MEAN definition handling in llwin32headers.h * Clean up includes of Windows API headers * Get rid of workaround to link against IPHLPAPI.lib in lluuid.cpp - this seems to have been an issue in the past that has been fixed
2024-09-12Merge branch 'develop' into release/luau-scriptingNat Goodspeed
2024-09-12Replace glh_linear usage with GLM (#2554)Rye Mutt