summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
AgeCommit message (Collapse)Author
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-20SL-14318 MacOS __write_nocancel crashAndrey Kleshchev
Multiple instances of viewer could write to the same uuid.inv file at the same time.
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-16Merge branch 'xcode-14.1' into DRTVWR-577-maint-SAndrey Kleshchev
D577 should have picked part of the changes from contribute branch, picking up the rest for the sake of branch specific crash fixes
2023-01-03DRTVWR-575: Replace some LLSDArray() usage with llsd::array().Nat Goodspeed
It seems newer compilers have a different interpretation of exactly when to engage LLSDArray's copy constructor. In particular, this assignment: some_LLSD_map[key] = LLSDArray(...)(...)...; used to convert the LLSDArray object directly to LLSD; now it first calls the custom copy constructor, which embeds the intended array within an outer array before assigning it into the containing map. The newer llsd::array() function avoids that problem because what it returns is already an LLSD object. Taking inventory of LLSDArray assignments of that form turned up a number of workarounds like LLSD(LLSDArray(...)). Replacing those with llsd::array() is both simpler and more readable. Tip of the hat to Chorazinallen for surfacing this issue!
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-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-12-03SL-18565 Built-in bump maps and some environment textures fail to loadAndrey Kleshchev
Due to udp texture fetching no longer being present
2022-11-30Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559Dave Parks
2022-11-30SL-18154 WIP -- CPU sampling (AMD uProf) profile guided optimizations to ↵Dave Parks
reduce CPU usage of background threads.
2022-11-28Merge remote-tracking branch 'origin/DRTVWR-528' into DRTVWR-559Brad Kittenbrink
2022-11-28Merge remote-tracking branch 'origin/main' into DRTVWR-528Brad Kittenbrink
2022-11-28SL-18362 FIXED Login screen is black on MacMaxim Nikolenko
2022-11-22Merge branch 'DRTVWR-568' into DRTVWR-539Mnikolenko Productengine
2022-11-22SL-18219 Crash getting and sending render info on exitAndrey Kleshchev
There might be other causes for sendRenderInfoToRegion and getRenderInfoFromRegion, crashing, but in some cases viewer was shutting down
2022-11-16SL-18154 Profile guided optimizations vs release viewer. Trim some unused ↵Dave Parks
abilities and remove some more fast timers.
2022-11-10SL-18602 Integrate queueModify/queueApply/queueUpdate into all the places ↵Dave Parks
that used to post to ModifyMaterialParams directly.
2022-11-08SL-18584 FIXED viewer starts in minimized mode after a clean installMnikolenko Productengine
2022-11-03SL-18565 Built-in bump maps and some environment textures fail to loadAndrey Kleshchev
Due to udp texture fetching no longer being present
2022-10-29Fix RenderAppleUseMultGL debug setting for enabling threaded GL engineRye 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-20Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-10-14SL-18293 Fix for broken wireframe mode.Dave Parks
2022-10-12SL-18190 Limit the number of decode threads.Dave Parks
2022-09-21SL-18202 WIP merging autotune contribution and updating UIMnikolenko Productengine
2022-09-20SL-18190 Don't allocate mips for irradiance maps because they're never ↵Dave Parks
generated. Disable OpenGL core profile on Intel by default.
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-09Merged in SL-17967 (pull request #1113)Howard Stearns
SL-17967 require 4.1 core profile
2022-09-01SL-18078, SL-18065 -- Experimentally allow uploading of lossless normal ↵Dave Parks
maps, fix for crash on shutdown.
2022-09-01Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into SL-17967Howard Stearns
2022-09-01SL-17967 - Git rid of ARB that is in coreHoward Stearns
2022-08-31SL-18065 WIP -- Adjust max virtual size to keep debug floater readable. ↵Dave Parks
Make assert on shutdown less frequent (still not gone, likely race condition). Fix unrelated assertion in reflection probes.
2022-08-30Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559Dave Parks
2022-08-30SL-17997 Fix for crash on shutdownDave Parks
2022-08-24DRTVWR-558: Re-enable --leap command-line switch for dev builds.Nat Goodspeed
The --leap command-line switch is independent of updater processing. It should NOT be suppressed when the updater is suppressed. --leap is used for viewer testing, which is important for dev builds!
2022-08-08SL-17927 Keep people from shooting themselves in the foot by twiddling ↵Dave Parks
deprecated settings.
2022-08-04Merge remote-tracking branch 'origin/master' into DRTVWR-559Brad Kittenbrink
2022-08-04Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h # indra/newview/llpanelobject.cpp
2022-08-04Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # indra/newview/llfloaterworldmap.cpp # indra/newview/llvovolume.cpp
2022-08-04Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 15:36:30 +0000