summaryrefslogtreecommitdiff
path: root/indra/newview/llgltfmateriallist.cpp
AgeCommit message (Collapse)Author
2024-06-11Clean up line endings that got mangled up during last mergeAnsariel
2024-06-11Merge branch 'main' of https://github.com/secondlife/viewer into ↵Ansariel
DRTVWR-600-maint-A # Conflicts: # indra/llappearance/llavatarappearance.h # indra/llimage/llimage.cpp # indra/llmath/llvolume.cpp # indra/llmath/llvolume.h # indra/llprimitive/llgltfmaterial.h # indra/llrender/llrendertarget.cpp # indra/llrender/llshadermgr.cpp # indra/newview/lldynamictexture.cpp # indra/newview/llenvironment.cpp # indra/newview/llfetchedgltfmaterial.cpp # indra/newview/llfloaterimagepreview.cpp # indra/newview/llfloaterimagepreview.h # indra/newview/llfloaterregioninfo.cpp # indra/newview/llfloaterregioninfo.h # indra/newview/llmaniprotate.cpp # indra/newview/llmaniptranslate.cpp # indra/newview/llpanelvolume.cpp # indra/newview/llselectmgr.cpp # indra/newview/llselectmgr.h # indra/newview/llsurface.cpp # indra/newview/llsurface.h # indra/newview/llsurfacepatch.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/lltinygltfhelper.cpp # indra/newview/llviewertexture.cpp # indra/newview/llviewerwindow.cpp # indra/newview/llviewerwindow.h # indra/newview/llvlcomposition.cpp # indra/newview/llvlcomposition.h # indra/newview/llvocache.cpp # indra/newview/llvovolume.cpp # indra/newview/pipeline.cpp
2024-06-10Post-merge - trim trailing whitespaceAndrey Lihatskiy
2024-06-01Re-enable a lot of compiler warnings for MSVC and address the C4267 ↵Ansariel
"possible loss of precision" warnings
2024-04-26#1325 Fix for GLTF overrides sometimes not showing up. (#1340)RunitaiLinden
2024-04-16Merge pull request #1230 from beqjanus/StopVoCacheTPHangsBrad Linden
Stop vo cache related tp hangs
2024-04-14Fix/Finish VoCache extrasBeq
The extras cache was never fully implemented and thus grows forever. This coupled with the server side "bug" that sends innumerable blank overrides leads users to collect 100MB+ SLEC files which in turn cause significant pauses post TP.
2024-04-06Port from JsonCPP to Boost.Json for json parsing and serializing (#1054)Rye Mutt
2024-03-18secondlife/viewer#1006: Move blank material constant to indra_constants.hCosmic Linden
2024-01-19Merge branch 'release/materials_featurette' into DRTVWR-592RunitaiLinden
2024-01-09SL-20780 Clean up some dead code.RunitaiLinden
2023-10-13Merge branch 'DRTVWR-559' into DRTVWR-592Cosmic Linden
2023-10-13DRTVWR-592: Fix broken minimap loading, improve minimap view of PBR ↵Cosmic Linden
materials (still not accurate, but better...)
2023-09-22SL-20321 Fix for missing "has_te" check (thanks Henri)RunitaiLinden
2023-09-21SL-20321 Interpret missing TEs in override messages as indication overrides ↵RunitaiLinden
should be nulled out if present.
2023-09-18SL-20229 Cache GLTF updates that are received before the object they're ↵RunitaiLinden
applied to is loaded.
2023-09-18SL-20229 Add blip for GLTF messages to "Show Updates to Objects"RunitaiLinden
2023-08-29SL-20229 Add GenericStreamingMessage and use it to receive GLTF material ↵RunitaiLinden
overrides
2023-05-04SL-18932 Canceling material selection only reverts overrideAndrey Kleshchev
2023-05-03Cleanup with SL-19675 fix. lifted empty check outside the workqueue post ↵Brad Linden
and cleaned up indentation
2023-05-03Improved fix for SL-19675 crash. How about just don't refer to data when ↵Brad Linden
you don't need it
2023-05-02Attempt at fixing thread safety possibly related to SL-19648Brad Linden
2023-04-19Implement SL-19605 handling of batched material overrides in ↵Brad Linden
LargeGenericMessage (#177)
2023-04-03SL-18458 Make LLVOCache the one source of truth on most recently received ↵RunitaiLinden
overrides. (#147)
2023-03-30CMake and tests fixups after merge with main for DRTVWR-559Brad Linden
2023-03-23Fix for SL-18458 overrides not applying when cache load happened before ↵Brad Linden
LLViewerObject::updateTEMaterialTextures call
2023-03-23SL-18458 Fix for overrides not applying if material is not loaded on rebuild.Dave Parks
2023-03-21Phase 2 of fix for SL-18458 material overrides not being cached properlyBrad Linden
2023-02-09SL-19080: Update GLTF Material asset upload to v1.1, with stricter GLTF ↵Cosmic Linden
compliance and removal of unsupported features
2023-01-25SL-19012: Fix new material IDs sometimes not applying when set via LSLCosmic Linden
2023-01-23SL-19014 Sanitize the override data sent for faces without GLTF materialsAndrey Kleshchev
2023-01-11Merge pull request #48 from secondlife/SL-18820cosmic-linden
Sl 18820: Build floater should preserve GLTF transforms when changing the PBR material
2023-01-10SL-18820: Fix applying material clearing transform overrides. Loosen some ↵Cosmic Linden
asserts to allow non-default transform overrides.
2023-01-10SL-18942 [PBR] LLPanelFace was missing 'transform' updates for some of the facesAndrey Kleshchev
2022-11-29SL-18732: Review feedbackCosmic Linden
2022-11-29SL-18732: Pass material list callbacks by referenceCosmic Linden
2022-11-29SL-18732: Use override update callback for LLMaterialEditor::updateLive as wellCosmic Linden
2022-11-29SL-18732: Fix flickering of control values when changing GLTF texture ↵Cosmic Linden
transforms in build floater
2022-11-24SL-18701 llsd is not thread safe, parse it before usingAndrey Kleshchev
2022-11-18SL-18668 Only object id is strictly requiredAndrey Kleshchev
2022-11-18SL-18668 Don't call makeMap from callbackAndrey Kleshchev
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-14Basic solution for SL-18458 vocache implementation for material overridesBrad Kittenbrink
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-11mac build fixAndrey Kleshchev
2022-11-10SL-18602 Integrate queueModify/queueApply/queueUpdate into all the places ↵Dave Parks
that used to post to ModifyMaterialParams directly.
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-28 11:38:48 +0000