summaryrefslogtreecommitdiff
path: root/indra/newview
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-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-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-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-20Increment viewer version to 6.6.6Nat Goodspeed
following promotion of DRTVWR-548
2022-10-20SL-18391 Fix local gltf materials to retain a copy of materialAndrey Kleshchev
2022-10-19SL-18105 Hook up TE override material to render pipe by way of render material.Dave Parks
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-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
2022-10-17More work on SL-17697 LLMaterialEditor now uses new override diffing code ↵Brad Kittenbrink
when applyToSelection() gets called
2022-10-17Merged in SL-18340 (pull request #1158)Sabrina Shanman
SL-18340: Fix PBR alpha materials treating spotlight as point light Approved-by: Dave Parks
2022-10-17Continuing work on SL-17697 Live editing with material overrides.Brad Kittenbrink
* Fixed Selection usage so material editor no longer hardcoded to a single object/face * made local preview hack the fallback for when the ModifyMaterialParams cap is missing
2022-10-17SL-18008 Placeholder functionality for PBR Edit buttonAndrey Kleshchev
2022-10-17SL-18008 Add Save and Edit buttons to right click menu for materialsAndrey Kleshchev
2022-10-17SL-18221 Water texture does not load after clearing cacheAndrey Kleshchev
Water texture should load only after having caps. Prefetch textures should load only after having caps. Prefetch list is now per grid
2022-10-17SL-17779 Texture position changes were ignored on rigged meshesAndrey Kleshchev
Since the performance overhaul project, there should be essentially no difference between rigged meshes and non-rigged as far as vertex buffer management is concerned.
2022-10-14Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-10-14SL-18105 Add to/from json capability to LLGLTFMaterialDave Parks
2022-10-14Added stub handler for GLTF LargeGenericMessage as part of work on SL-18105 ↵Brad Kittenbrink
SL-17697 and SL-17698
2022-10-14Fix SL-17697 local_id usageBrad Kittenbrink (Brad Linden)
2022-10-14WIP for SL-18103 and SL-17697 live editing of materials using ↵Brad Kittenbrink (Brad Linden)
ModifyMaterialParams cap
2022-10-14SL-18293 Fix for broken wireframe mode.Dave Parks
2022-10-13SL-18340: Consistently use HAS_SUN_SHADOW for shader permutationCosmic Linden
2022-10-13SL-18340: Consolidate shared pbr shading into calcDiffuseSpecular, pbrBaseLightCosmic Linden
2022-10-13Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-10-13SL-18376 Fix for transparent legacy avatar bits disappearing.Dave Parks
2022-10-13SL-18362 Fix mac shader loadingBrad Kittenbrink
2022-10-13SL-18340: Fix PBR alpha materials treating spotlight as point lightCosmic Linden
2022-10-13SL-18125 Separate GLTF permissions from normal uploadsAndrey Kleshchev
2022-10-13SL-18190 Tweak reflection probe mixing on water.Dave Parks
2022-10-13SL-18190 Fix for blurry name tags.Dave Parks
2022-10-13SL-18367 Fix for some objects rendering purple -- globally set number of ↵Dave Parks
indexed texture channels instead of allowing it to vary from one shader to the next.
2022-10-12SL-18190 Limit the number of decode threads.Dave Parks
2022-10-12SL-18316 Fix for hud attachments being invisible.Dave Parks
2022-10-12SL-18190 Fix for assert on 360 snapshot and ? fix for mac build ?Dave Parks
2022-10-12Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-10-13SL-18346 Fix a typoAndrey Kleshchev
2022-10-12SL-18190 Fix for mismatch between alpha and opaque water fog.Dave Parks
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 18:37:51 +0000