summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2022-11-16Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-11-16SL-18154 Profile guided optimizations vs release viewer. Trim some unused ↵Dave Parks
abilities and remove some more fast timers.
2022-11-16SL-18632: Un-hide planar align options when editing GLTF textures in build ↵Cosmic Linden
floater
2022-11-16A few tweaks to SSR while I'm in the neighborhood.Geenz
Mostly just making it actually kind of work. Still needs a lot more tweaking - but can revisit later. SL-18332
2022-11-15SL-18632: Implement editing GLTF material texture transforms in build floaterCosmic Linden
2022-11-15SL-18458 VOCache cleanup region_handle message encoding.Brad Kittenbrink
Really wish there were a native way to send S64/U64 values in llsd.
2022-11-14Merged in SL-18634 (pull request #1198)Sabrina Shanman
SL-18634: Fix GLTF material texture transform not serializing when texture ID is null
2022-11-14SL-18634: Fix GLTF material texture transform not serializing when texture ↵Cosmic Linden
ID is null
2022-11-14SL-18637 Reverted material shader changesAndrey Lihatskiy
original fix by Beq Janus
2022-11-14Merged in SL-18627 (pull request #1193)Sabrina Shanman
SL-18627: Make space for pbr transform controls in build floater and disable some WIP controls Approved-by: Andrey Kleshchev
2022-11-14Basic solution for SL-18458 vocache implementation for material overridesBrad Kittenbrink
2022-11-14Merged in SL-18332 (pull request #1194)Jonathan Goodman
First pass of Screen Space Reflections Approved-by: Dave Parks
2022-11-14SL-18485 Cleanup -- remove unused GLTF specific vertex attributes from ↵Dave Parks
LLVertexBuffer (blows past 16-attribute limit)
2022-11-13Use const& as it is illegal to bind a non const reference to a temporaryNicky
2022-11-12SL-18391 Basic gltf material accountingAndrey Kleshchev
Plan is to expand it as needed with overrides, request rate and memory
2022-11-12SL-18518 Move 'json to override' work to background threadAndrey Kleshchev
2022-11-11SL-18566 Fix for legacy transparency being opaque under water.Dave Parks
2022-11-11SL-18615 Fix for beacons not rendering and beacon highlights flickering.Dave Parks
2022-11-11SL-18627: Make space for pbr transform controls in build floater and disable ↵Cosmic Linden
some WIP controls
2022-11-11SL-18616 Fix for dropping mOverrideAlphaMode on copyDave Parks
2022-11-11SL-18630 Fix for probes often ending up under the terrain.Dave Parks
2022-11-11mac build fixAndrey Kleshchev
2022-11-10SL-18602 CrashfixAndrey Kleshchev
2022-11-10SL-18602 Update server params on drag n dropAndrey Kleshchev
2022-11-10SL-18617 Disable fullbright checkbox and color swatch when GLTF material is ↵Dave Parks
present.
2022-11-10SL-18573 Fix for HUD text being wrong color.Dave Parks
2022-11-10Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-11-10SL-18602 Integrate queueModify/queueApply/queueUpdate into all the places ↵Dave Parks
that used to post to ModifyMaterialParams directly.
2022-11-10SL-18583 Missed flushUpdatesAndrey Kleshchev
2022-11-10SL-18583 Fixed incorrect values being applied when returning to a case ↵Andrey Kleshchev
without override
2022-11-09Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559 # Conflicts: # indra/newview/llgltfmateriallist.h
2022-11-09SL-18602 Fix for applying material asset not removing overrides on drag-and-dropDave Parks
2022-11-09SL-18518 Move json to material work to background threadAndrey Kleshchev
2022-11-09SL-18583 Use gltf overrides as a base for live editing to send only minimal ↵Andrey Kleshchev
changes
2022-11-09Revert "SL-18523: When editing an object's material override, use the ↵Sabrina Shanman
object's material override as a base, rather than its render material (pull request #1190)"
2022-11-09Merged in SL-18523 (pull request #1190)Sabrina Shanman
SL-18523: When editing an object's material override, use the object's material override as a base, rather than its render material
2022-11-09Merge remote-tracking branch ↵Andrey Lihatskiy
'BeqJanus/ll-viewer-pull-requests/Beq-alpha-mask-on-emissive-fix' into DRTVWR-570-maint-Q
2022-11-09Merge remote-tracking branch 'ZiRee/viewer/master' into DRTVWR-570-maint-QAndrey Lihatskiy
2022-11-09SL-18583 Copy&Paste support for overridesAndrey Kleshchev
And a fix for SL-18583
2022-11-08SL-18523: When editing an object's material override, use the object's ↵Cosmic Linden
material override as a base, rather than its render material
2022-11-08SL-18197 Bump inventory cache versionAndrey Kleshchev
Issue: release viewer saves materials as AT_UNKNOWN (255). When material viewer loads cache with materials saved as '255' instead of '57', material viewer doesn't know to update content and it casuses issues. Viewer eventally recovers, but it's simpler to drop cache in this case over trying to figure out if our unknown is a material (but may be cache should include asset type count to let viewer know when to double check unknowns). Also made 'legacy' materials folder's name localizable just in case.
2022-11-08Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-11-08SL-18585 Batch updates to ModifyMaterialParams capability.Dave Parks
2022-11-08SL-18583 Make Live Material editor restore changes when canceling in texture ↵Andrey Kleshchev
or color pickers
2022-11-07SL-18583 Make tools floater restore overrides when canceling changes #1Andrey Kleshchev
This works only partially since changes from material editor are not yet tracked.
2022-11-07SL-18583 Fix race condition when setting multiple facesAndrey Kleshchev
And fix cases of updates not applying
2022-11-05[BUG-232834][BUG-232871] Alpha mask is being applied with emissive maskBeq
This is the most local fix for this issue, addressing the specific unqualified use of HAS_ALPHA_MASK. If we find other issues with alpha mask being applied incorrectly then, it may be better to fix higher up in llvieweshadermgr.cpp by reverting the changes from SL-17532. For now, this way works for this specific bug without non-emissive side-effects.
2022-11-05SL-18581 Don't show the starter avatar toolbar button for NUXAndrey Lihatskiy
2022-11-04SL-18560 Mac build fixAndrey Kleshchev
2022-11-04SL-18560 Make local materials save correctly from right-click menuAndrey Kleshchev