summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2022-10-27SL-18446 Live editing material should not override objects without pbrAndrey Kleshchev
Objects without pbr have no base to override
2022-10-27SL-18008 Edit PBR in menu should not be enabled if selection has no pbr ↵Andrey Kleshchev
materials
2022-10-27SL-17699 Enable 'none' button it amterial pickerAndrey Kleshchev
2022-10-27SL-18459 WIP -- fix for assert in setGLTFMaterialDave Parks
2022-10-27SL-18454 Fix for HUDs with alpha mask using wrong shader.Dave Parks
2022-10-26SL-18472 Fix for assert when increasing number of texture entries on ↵Dave Parks
existing primitive with overrides applied.
2022-10-26Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-10-26SL-18469 Fix for material edits only applying to one face.Dave Parks
2022-10-27SL-18465 Crash opening Material EditorAndrey Kleshchev
2022-10-26Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-10-26SL-18443 Allow nulling out of override data and implement new override ↵Dave Parks
message protocol.
2022-10-26Merged in SL-17005_cosmic_win8 (pull request #1106)Sabrina Shanman
SL-17005: Clean up debug code
2022-10-26SL-18446 Support "multiple textures" in Live material overridesAndrey Kleshchev
2022-10-26Merge remote-tracking branch 'origin/master' into DRTVWR-559Brad Kittenbrink
2022-10-26Increment viewer version to 6.6.7Nat Goodspeed
following promotion of DRTVWR-574
2022-10-26SL-18446 Terse-update selection set from live material editor #1Andrey Kleshchev
2022-10-26SL-18444 Either connection should be create in onOpen or disconnect happen ↵Andrey Kleshchev
in destructor
2022-10-26SL-18444 Live Material Editor updating with selectionAndrey Kleshchev
2022-10-25Xcode build fixes for DRTVWR-559Brad Kittenbrink
2022-10-25SL-18008 Add "Save/Edit Materials" buttons to attachment's right click menuAndrey Kleshchev
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-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-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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 07:27:39 +0000