summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-10-24Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-10-24SL-17021 Fix some changes vanishing over merge to D559 #2Andrey Kleshchev
2022-10-24SL-17021 Fix some changes vanishing over merge to D559Andrey Kleshchev
2022-10-23Bring back Nat's tribute to Macho Man Randy Savage by reverting:Nicky
"SL-18389 - tracking down an odd code-signing issue on mac - speculative fix - this is the only different between this and other viewers that do run correctly" This reverts commit 074ff9fd4bbe0a6c6d589b3bdf5fe1a48df0b1ed.
2022-10-23Revert "SL-18390: speculative fix for broken notarization - part2"Nicky
This reverts commit 31917709d9f4d9d4742910ae7990009a1580b150.
2022-10-23Remove ll::bugsplat as a llcommon depencencyNicky
In theory it is fine to do that, in practice it does break gatekeeper in subtle ways due to https://developer.apple.com/library/archive/technotes/tn2206/_index.html#//apple_ref/doc/uid/DTS40007919-CH1-TNTAG207 Having bugsplat linked to all executables results in executables with an embedded rpath that is invalid for Gatekeeper. Luckily it shows this is in the worst possible way. The viewer cannot be started with a non helpful message of teh viewer being unable to verified. While at the same time spctl and codesign both show no errors at all.
2022-10-22SL-18105 When saving an object's material to inventory, save the version ↵Dave Parks
that as overrides applied.
2022-10-22SL-18105 Fix for crash when attempting to "Edit PBR Material" when there's ↵Dave Parks
no PBR material
2022-10-21SL-18105 Hook up live material editor to current selection set and ↵Dave Parks
implicitly open build floater when editing a PBR material.
2022-10-21SL-18390: speculative fix for broken notarization - part2Callum Prentice
2022-10-21SL-18105 Clean up class1/deferred/materialF.glsl (merge cleanup), make ↵Dave Parks
override messaging LLSD where it ought to be and JSON where it ought to be.
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-20SL-18105 Add remaining parameters to applyOverrideDave Parks
2022-10-20SL-18423 Post-merge: restore RyeMutt's fix from SL-18412Andrey Lihatskiy
2022-10-20Merge branch 'master' into DRTVWR-570-maint-QAndrey Lihatskiy
# Conflicts: # indra/newview/llnetmap.cpp # indra/newview/llnetmap.h
2022-10-20Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-10-20SL-18105 Fix for overrides not showing until a forced mesh update.Dave Parks
2022-10-20Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-10-20Increment viewer version to 6.6.6Nat Goodspeed
following promotion of DRTVWR-548
2022-10-20Merged in SL-18411 (pull request #1166)Sabrina Shanman
SL-18411: Copy over LLGLTFMaterial changes (most notably various getters/setters and texture transform stub) Approved-by: Dave Parks
2022-10-20SL-18411: Copy over LLGLTFMaterial changes (most notably various ↵Cosmic Linden
getters/setters and texture transform stub)
2022-10-20SL-18391 Fix local gltf materials to retain a copy of materialAndrey Kleshchev
2022-10-19Fix leak of LLFolderViewModel sorter and filter with unique_ptrRye Mutt
2022-10-19Fix leak of mRoot during LLAvatarAppearance destructionRye Mutt
2022-10-19Fix leak of tex layer objects during LLLocalTextureObject destructionRye Mutt
2022-10-19Fix use after free of inventory offer in ↵Rye Mutt
LLGroupNoticeNotificationListItem::onClickAttachment This is due to forceResponse deleting the inventory offer upon completion
2022-10-19Fix leak of item pairs during LLFlatListView destructionRye Mutt
2022-10-19Fix use after free in inventory object deletionRye Mutt
2022-10-19Fix use after free in material managerRye Mutt
2022-10-19Fix use after free of LLUUID in script notificationsRye Mutt
2022-10-19Fix use after free in LLWorld::removeRegionRye Mutt
2022-10-19Fix trivial memory leaks in note card processing, chat history, and task ↵Rye Mutt
inventory
2022-10-20SL-18353 Don't allow "Ungroup folder items" on outfit foldersAndrey Lihatskiy
2022-10-19Xcode compat fix for SL-18105 material overridesBrad Kittenbrink
2022-10-19SL-18105 Hook up TE override material to render pipe by way of render material.Dave Parks
2022-10-19SL-18412 Merge remote-tracking branch 'RyeMutt/viewer/menu-leaks' into ↵Andrey Lihatskiy
DRTVWR-570-maint-Q
2022-10-19Fix various menu leaks and lazy creation in chiclets, bump floater, media ↵Rye Mutt
controls, and the mini map
2022-10-19Fix menu leaks and lazy creation in text editing and scroll listsRye Mutt
2022-10-19Defer chat history menu creation to right click time to reduce heavy menu ↵Rye Mutt
bloat and fix chat history menu hoarding
2022-10-19Reduce folderview menu bloat via lazy creation on right clickRye Mutt
2022-10-19Fix leak of context menu branchesRye Mutt
Introduce menu bloat logging code
2022-10-19SL-18105 Hook up render pipe directly to LLTextureEntry::mGLTFMaterial and ↵Dave Parks
add LLViewerFetchedTextures to LLFetchedGLTFMaterial. Lower reflection probe resolution to 128x128 per side.
2022-10-19SL-18105 viewer side for handling Material Override LargeGenericMessageBrad Kittenbrink
LLGLTFMaterialList now decodes gltf json overrides from the server and stores them in LLTextureEntry::mGLTFMaterialOverrides
2022-10-18Better fix for mac/xcode compatibility problem in SL-18391. Keep using ↵Brad Kittenbrink
unordered_map
2022-10-18SL-18389 - tracking down an odd code-signing issue on mac - speculative fix ↵Callum Prentice
- this is the only different between this and other viewers that do run correctly
2022-10-18include the right header now that uuid_mat_map_t is std::map for SL-18391Brad Kittenbrink
2022-10-18Fix ror mac build error in SL-18391 lifetime managementBrad Kittenbrink
2022-10-19SL-18391 Basic GLTF lifetime managementAndrey Kleshchev
2022-10-18SL-18008 Mac build fixAndrey Kleshchev
2022-10-18SL-18008 Updated Save and Edit PBR buttonsAndrey Kleshchev