summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2024-01-24Merge remote-tracking branch 'origin/release/materials_featurette' into ↵Jonathan "Geenz" Goodman
DRTVWR-583
2024-01-19SL-20606: Full GLTF material preview. Works for most materials.Cosmic Linden
2023-11-29Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/llcommon/CMakeLists.txt # indra/newview/llspatialpartition.cpp # indra/newview/llviewergenericmessage.cpp # indra/newview/llvoavatar.cpp
2023-10-26SL-20536: Fix build error C1128. secondlife-bin object file too big. Compile ↵Cosmic Linden
with /bigobj
2023-10-25Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-10-26D587 Post merge fmod issues fixAndrey Kleshchev
2023-10-16Merge branch 'DRTVWR-559' into DRTVWR-583Jonathan "Geenz" Goodman
2023-10-04SL-18837: Merge branch 'main' of secondlife/viewer into actionsNat Goodspeed
2023-10-03Merge branch 'main' (DRTVWR-567) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/VIEWER_VERSION.txt # indra/newview/llagent.cpp # indra/newview/llfloaternewfeaturenotification.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorymodel.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/llpanelmaininventory.cpp # indra/newview/llpanelmaininventory.h # indra/newview/llsidepaneltaskinfo.cpp # indra/newview/llsidepaneltaskinfo.h # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/llviewerinventory.cpp # indra/newview/llviewerobject.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llviewertexturelist.h # indra/newview/skins/default/xui/en/floater_new_feature_notification.xml # indra/newview/skins/default/xui/en/menu_inventory.xml
2023-09-07SL-18837: Without USE_BUGSPLAT, no target generate_symbols.Nat Goodspeed
2023-09-02SL-19243: Post xcarchive.zip instead of separate symbols tarball.Nat Goodspeed
On Mac, in the CMake USE_BUGSPLAT logic, we created both xcarchive.zip (which is what BugSplat wants to see) and secondlife-symbols-darwin -64.tar.bz2 (which we don't think is used for anything). The tarball was posted to codeticket -- but why? If the point is to manually re-upload to BugSplat in case of failure, we'll do better saving xcarchive.zip to codeticket. For SL-19243, posting xcarchive.zip directly supports the goal of breaking out the upload to BugSplat as a separate step. Anyway, since xcarchive.zip is a superset of the tarball, the tarball can be recreated from the zip file, whereas the zip file can't be recreated from the tarball without opening the .dmg installer and extracting the viewer executable. If the xcarchive.zip file exists (that is, on Mac), post that to codeticket or GitHub, as applicable, instead of the tarball. In fact, in the USE_BUGSPLAT case, don't even bother creating the tarball since we're going to ignore it. Make the new build.sh logic that insists on BUGSPLAT_USER and BUGSPLAT_PASS conditional on BUGSPLAT_DB.
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-06-29SL-19929 New inventory feature notificationAndrey Kleshchev
2023-05-02Merge branch 'main' into DRTVWR-567Andrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp
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-30Merge branch 'main' into DRTVWR-567Maxim Nikolenko
# Conflicts: # indra/newview/llinventoryfunctions.cpp # indra/newview/llpanelmaininventory.h # indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml # indra/newview/skins/default/xui/en/sidepanel_item_info.xml
2023-03-29Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-03-29SL-19479 Remove outfit photo preview and replace with a pop upAndrey Kleshchev
2023-03-29SL-19379 WIP add basic context menuMaxim Nikolenko
2023-03-21SL-19379 WIP Gallery view Inventory: first passMaxim Nikolenko
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-24SL-19234 add Inventory settings floaterMaxim Nikolenko
2023-02-21SL-19108 Rename outfit snapshot floaterAndrey Kleshchev
2023-02-17SL-19108 Build fixAndrey Kleshchev
2023-02-17SL-19108 WIP Managing inventory thumbnail #1Andrey Kleshchev
2023-02-08SL-19134 Remove llfloaterpropertiesAndrey Kleshchev
Looks like it wasn't used for a while and LLFloaterItemPropertie does the same thing now
2023-02-07SL-19134 Thumbnail ctrlAndrey Kleshchev
LLIconCtrl stores icons indefinitely which is undesired for fairly large and expected to be numerous thumbnails, LLTextureCtrl is tied to texture picker and has a number of limitations (already processes clicks, enforces label area). Intent behind LLThumbnailCtrl is to bridge the gap - to not store texture indefinitely and to allow further customisation.
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-567Maxim Nikolenko
# Conflicts: # indra/newview/llappearancemgr.cpp # indra/newview/llpanelmaininventory.cpp
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-01Add a texture inspector and show it when hovering over an inventory textory ↵Kitty Barnett
(or folder containing - among others - exactly one texture) and when hovering over notecard embedded textures
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-03 15:20:45 +0000