summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2023-08-29Merge branch 'DRTVWR-559' into DRTVWR-583Jonathan "Geenz" Goodman
2023-08-21SL-20145 New inventory feature notificationAndrey Kleshchev
Pulled in relevant parts from SL-19929
2023-08-07Revert LLReflectionMapManagerJonathan "Geenz" Goodman
DRTVWR-583
2023-04-26Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539Brad Linden
2023-04-03SL-18458 Followup -- disable vocache unit test to unstick build, sanitize ↵Dave Parks
"object_id" to "local_id"
2023-03-30CMake and tests fixups after merge with main for DRTVWR-559Brad 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-03-13Partial solution for SL-18458 Materials override cache not working and ↵Brad Linden
related SL-18684/SL-19206/SL-19173
2023-02-03SL-19148 Decruft some forward shaders and drawpools. Fix HUDs being in ↵Dave Parks
wrong color space.
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-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-11-22Merge branch 'DRTVWR-568' into DRTVWR-539Mnikolenko Productengine
2022-10-19SL-18391 Basic GLTF lifetime managementAndrey Kleshchev
2022-10-12SL-18190 Remove water reflection detail combo box and reimplement ↵Dave Parks
"Transparent Water" checkbox.
2022-10-04SL-18293, SL-18190 -- Fix for debug displays not showing up (wireframe still ↵Dave Parks
busted). WIP on reflection probe/PBR driven water shader.
2022-10-01SL-16542 Pull in chunks of graham's openjpeg code, update openjpeg and ↵Andrey Kleshchev
enable partial bitstreams Openjpeg was modified: "p_max_len -= l_nb_bytes_read;" was causing an overflow. I'm not sure if I did something incorectly in opj_skip/opj_seek viewer side, but seems like openjpeg should have been checking remaining space in p_max_len either way. P.S. Many thanks to Chafey and Neopallium for implementing openjpeg's partial bitstream support
2022-09-21SL-18202 WIP merging autotune contribution and updating UIMnikolenko Productengine
2022-09-21Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
2022-09-17Remove some leftovers of the old precompiled headers usage. Pointed out by ↵Nicky Dasmijn
Ansariel Hiller.
2022-09-17Merge test cleanup.Nicky Dasmijn
2022-09-17SL-17238 Supress errors from physicsextensionsAndrey Kleshchev
2022-09-17Cleanup sweepNicky Dasmijn
2022-09-17cmake playing jedi mind tricks on me and making me missNicky
one genex that needed changing. Interstingly add_custom_target will not complain about a file that would never be declared as OUTPUT and thus is not really a valid cmake build target.``
2022-09-17Try to make sure this also works with the havok version of llphysicsextension.Nicky Dasmijn
2022-09-16Rename MESHOPTIMIZER.cmake to Meshoptimizer.cmake as those caps honestly bug me.Nicky Dasmijn
2022-09-16Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky Dasmijn
DRTVWR-568_cmake
2022-08-31Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
# Conflicts: # indra/newview/llfloateroutfitsnapshot.cpp
2022-08-31Merge branch master (DRTVWR-483) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/lllocalbitmaps.cpp # indra/newview/lllocalbitmaps.h # indra/newview/llviewerregion.cpp # lllocalgltfmaterials.* were modified to match lllocalbitmaps*
2022-08-30Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559Dave Parks
2022-08-23SL-17653 Local gltf materials #2Andrey Kleshchev
2022-08-23SL-17653 Basic local gltf materialsAndrey Kleshchev
2022-07-20SL-17670 remove tab charactersMnikolenko Productengine
2022-07-19SL-17670 Simplify outfit snapshot floaterMnikolenko Productengine
2022-06-29SL-17685 Drag and drop material supportDave Parks
2022-06-29Merge branch 'master' (DRTVWR-543) into DRTVWR-559Andrey Kleshchev
# Conflicts: # autobuild.xml # indra/llrender/llgl.cpp # indra/newview/CMakeLists.txt # indra/newview/llvovolume.cpp
2022-06-29Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
2022-06-29Merge branch 'master' (DRTVWR-543) into DRTVWR-483Andrey Kleshchev
# Conflicts: # indra/newview/llviewertexturelist.cpp
2022-06-21SL-17600 WIP -- Proper radiance maps (not just mipped cubemaps).Dave Parks
2022-06-20Cleanup dependency on ui libraries.Nicky
2022-06-14SL-17586 WIP -- LLMaterialEditor prototype and "New Material" inventory buttons.Dave Parks
2022-06-09SL-17483: Add integration test for CommonControlNat Goodspeed
and for LLViewerControlListener, to which it talks. Fix glitches detected by the tests.
2022-06-06SL-15312 Larger image previewAndrey Kleshchev
At the moment without cursor handling
2022-06-05Port new cmake files (Trace/Meshoptimizer) to modern cmakeNicky
2022-06-05Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky
DRTVWR-543-maint_cmake
2022-05-31SL-17490 Only update a subset of textures each frame and remove dead debug code.Dave Parks
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 10:17:37 +0000