summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2023-10-04SL-18837: Merge branch 'main' of secondlife/viewer into actionsNat Goodspeed
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-06-29SL-19929 New inventory feature notificationAndrey Kleshchev
2023-05-02Merge branch 'main' into DRTVWR-567Andrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp
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-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-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-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-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 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-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-07-20SL-17670 remove tab charactersMnikolenko Productengine
2022-07-19SL-17670 Simplify outfit snapshot floaterMnikolenko Productengine
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-20Cleanup dependency on ui libraries.Nicky
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-15312 Tweaks and fixesAndrey Kleshchev
- Allowed resizing text fields for classifieds in profiles - Fixed mislabeled floater from picks to classifieds - Fixed classified floater's title - Added support to see multiple classifieds - Removed obsolete panels - Fixed pick requests for various menus - Fixed pick creation from landmarks - Improved online status handling - Updated headers in files
2022-05-27Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/cmake/LLCommon.cmake # indra/llcommon/CMakeLists.txt # indra/llrender/llgl.cpp # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llflexibleobject.cpp # indra/newview/llvovolume.cpp
2022-05-26Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/llviewertexturelist.cpp
2022-05-08- Slightly better documentation string for --configuration, as this really ↵Nicky
is used for the configs build subdirectory. - Always pass the correct configuration for --buildtype - Use 'buildtype' when determining defbug/release/... build. --configuration should not be used for this, as it is the subdirectories name (CMAKE_CFG_INTDIR)
2022-05-07Adapt gnerator expression usage to work on OSX.Nicky
2022-05-01Another place that needed generator expressions.Nicky
2022-05-01Simplify cmake files by uaing generator expressions and be moreNicky
configuration specific, rather than staging files to Release and RelWithdebInfo all the time
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 01:14:50 +0000