summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-10-25SL-18008 Add "Save/Edit Materials" buttons to attachment's right click menuAndrey Kleshchev
2022-10-25SL-18438 Mac build fixAndrey Lihatskiy
2022-10-25Merge remote-tracking branch 'RyeMutt/viewer/pod-uuid' into DRTVWR-570-maint-QAndrey Lihatskiy
2022-10-25SL-17991 update tooltip over Clear History buttonMaxim Nikolenko
2022-10-25Restore LLUUID to a plain old data type in a post-c++11 worldRye Mutt
2022-10-24Merge master into DRTVWR-568 (and fix conflicts)Callum Linden
2022-10-24Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-10-24SL-18105 Add mechanism for applying overrides that were received before ↵Dave Parks
associated ViewerObject was ready to receive them.
2022-10-24SL-18414 Smarter material editor's cancel for overridesAndrey Kleshchev
2022-10-24SL-18432 Fix for alpha sortingAndrey Lihatskiy
2022-10-24SL-18388 Searchable debug settings UIMnikolenko Productengine
2022-10-24Re-merged llvovolume.cppAndrey Kleshchev
Too many issue were detected after merge, so did a clean remerge of the file.
2022-10-24SL-17532 Fix some changes vanishing over merge to D559Andrey Kleshchev
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-21Post-merge fixMnikolenko Productengine
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-21Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # indra/newview/llfloaterpreference.cpp # indra/newview/llviewercontrol.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