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-17Remove the original prototype tool Bulky Thumbs since it is now superceded ↵Callum Prentice
by the Inventory Thumbnail Helper tool
2023-08-11 SL-20109: Now that it seems that the tool might be useful, make a new ↵Callum Prentice
version with a proper name and start worknig on it. Prototype bulky thumbs one will be removed after new version is working
2023-08-07Revert LLReflectionMapManagerJonathan "Geenz" Goodman
DRTVWR-583
2023-08-01First commit of code to investigate how we might do bulk uploads of ↵Callum Prentice
inventory item thumbnails - both from a code and a UI perspective
2023-06-29SL-19929 New inventory feature notificationAndrey Kleshchev
2023-05-02MErge with main after Viewer releaseCallum Prentice
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-19SL-19623 Updated contributionsAndrey Kleshchev
2023-04-19SL-19623 Merge 'CMake' pull request #150 from Ansarielakleshchev
Fix CMake files related to ICU4C
2023-04-14SL-19575 Create emoji gallery access iconAlexander Gavriliuk
2023-04-10SL-19078: changes to autobuild to unpack the emoji/shortcode 3p library and ↵Callum Prentice
then copy the XML files to the right place in the Viewer dev tree (indra/newview/skins/xui/*/emoji_characters.xml)
2023-04-04Fix CMake files related to ICU4CAnsariel
2023-04-03SL-18458 Followup -- disable vocache unit test to unstick build, sanitize ↵Dave Parks
"object_id" to "local_id"
2023-04-03DRTVWR-489: Fix things up after a messy merge with main because of a ↵Callum Prentice
gigantic CMake patch. Sadly, my macOS box updated to Xcode14.3 overnight and that caused many warnings/errors with variables being initialized and then used but not in a way that affected anything.. Building on Xcode 14.3 also requires that MACOSX_DEPLOYMENT_TARGET be set to > 10.13. Waiting on a decision about that but checking this in in the meantime. Builds on macOS with appropriate build variables set for MACOSX_DEPLOYMENT_TARGET = 10.14 but not really expecting this to build in TC because (REDACTED). Windows version probably hopelessly broken - switching to that now.
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-08Merge branch 'xcode-14.1' into DRTVWR-489-emojiKitty Barnett
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
2023-01-26DRTVWR-489-emoji: Pull in some small changes from Kitty's work to move the ↵Callum Prentice
macOS build forwards
2023-01-20Fix merge conflicts after auto mergeCallum 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-11-09Merge branch contribution/emoji into DRTVWR-489-emojiKitty Barnett
2022-10-23Add mini emoji (auto-)complete helperKitty Barnett
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 14:58:25 +0000