summaryrefslogtreecommitdiff
path: root/indra/llwindow
AgeCommit message (Collapse)Author
2023-04-26Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539Brad Linden
2023-03-31Merge branch 'main' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/newview/llfloateravatarrendersettings.cpp
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-03-10SL-19172 Texture streaming tune up. Incidental decruft.Dave Parks
2023-02-08DRTVWR-559 Remove some 32-bit color paranoia checks (potential fix for ↵Dave Parks
running under wine)
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
2023-02-02Merge branch 'main' into DRTVWR-573-maint-RAndrey Lihatskiy
2023-01-19Optimizations, decruft, and intel compatibility pass (#53)RunitaiLinden
SL-18869, SL-18772 Overhaul VBO management, restore occlusion culling, intel compatibility pass, etc
2023-01-19SL-18999 IME disabling should be called in window's threadAndrey Kleshchev
For some reason positioning IME window works fine, but disabling and enabling ime works from window's thread only
2023-01-18SL-18985 Crash at std::basic_string::eraseAndrey Kleshchev
2023-01-12SL-12456 Potential fix for NSPersistentUIFileManager crashAndrey Kleshchev
NSPersistentUIFileManager is supposed to be responsible for restoring window position and size
2023-01-12Merge branch 'main' into DRTVWR-573-maint-RAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/llagent.cpp # indra/newview/llimview.cpp # indra/newview/llimview.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llpanelmediasettingsgeneral.cpp # indra/newview/pipeline.cpp
2022-12-16SL-18719 GL 3.0/3.1 compatibility pass.Dave Parks
2022-12-16SL-18384 Fix NSException for keyboard handlingAndrey Kleshchev
Affects accent keys for diacritical marks
2022-12-13Merge branch 'main' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # doc/contributions.txt # indra/newview/llappviewer.cpp # indra/newview/skins/default/colors.xml
2022-12-12Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2022-12-12DRTVWR-559 Fix for windows build.Dave Parks
2022-12-12Merge branch 'main' into DRTVWR-568Callum Prentice
2022-12-12Merge branch 'main' into DRTVWR-570-maint-QAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloater360capture.cpp
2022-11-30SL-18154 WIP -- CPU sampling (AMD uProf) profile guided optimizations to ↵Dave Parks
reduce CPU usage of background threads.
2022-11-29SL-18682 WIP -- Add debug settings that aid in emulating low end hardware.Dave Parks
2022-11-25SL-18713 fix crash in handleCompositionMessage (#12)Maxim Nikolenko
2022-11-22Merge branch 'DRTVWR-568' into DRTVWR-539Mnikolenko Productengine
2022-11-17SL-18154 Profile guided optimizations -- remove some unneeded operations and ↵Dave Parks
make LLDrawPoolMaterials less branchy.
2022-11-02SL-18136 fix for Japanese IMEMnikolenko Productengine
2022-11-02Merge remote-tracking branch 'RyeMutt/viewer/mac-fixes' into DRTVWR-570-maint-QAndrey Lihatskiy
2022-10-30Fix checks for empty LLSD maps to use size and not emptyMap which is for ↵Rye Mutt
creating an empty LLSDMap type.
2022-10-29Fix use of deprecated CGDisplayAvailableModes with CGDisplayCopyAllDisplayModesRye Mutt
2022-10-29Fix RenderAppleUseMultGL debug setting for enabling threaded GL engineRye Mutt
2022-10-28Clean up autorelease behavior in llwindowmac and additional leaksRye Mutt
2022-10-28Fix leak of copy and paste on macRye Mutt
2022-10-26Merged in SL-17005_cosmic_win8 (pull request #1106)Sabrina Shanman
SL-17005: Clean up debug code
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-20Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-10-13SL-18190 Potential fix for sapping CPU when "sleeping"Dave Parks
2022-10-06SL-18190 Water shader WIP. Better parallax correction for sphere probes. ↵Dave Parks
Reduce probe memory footprint. Remove framebuffer copies and move to deprecate stencil buffer usage.
2022-10-03SL-17541 simple fallback when refresh rate is unknownMaxim Nikolenko
2022-09-21Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
2022-09-17SL-17238 Fix coding policy build issuesAndrey Kleshchev
2022-09-16Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky Dasmijn
DRTVWR-568_cmake
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-09-15Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-09-01SL-17967 - Git rid of ARB that is in coreHoward Stearns
2022-08-30Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into initscapadeHoward Stearns