summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelface.cpp
AgeCommit message (Collapse)Author
2023-08-03SL-19303 switch automatically between Materials/PBR/Media based on current ↵Maxim Nikolenko
values
2023-07-31Merge branch 'DRTVWR-559' into DRTVWR-583Jonathan "Geenz" Goodman
2023-07-27SL-18396 PBR and blinn phong should not be allowed to be edited togetherAndrey Kleshchev
2023-07-18Fix for irradiance breaking.Jonathan "Geenz" Goodman
Still need to fix the problem with individual faces getting tossed around though. Will work on that tomorrow. DRTVWR-583
2023-07-17Delete unprintable chars that accidentally got into the merge in kdiff3 for ↵Brad Linden
DRTVWR-559
2023-07-17Merge branch 'DRTVWR-559' into DRTVWR-583Jonathan "Geenz" Goodman
2023-07-17Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-07-11SL-19141 Fixed applying a no-copy texture to two objects failing silentlyAndrey Kleshchev
2023-06-27Just about got hero reflection maps working.Jonathan "Geenz" Goodman
DRTVWR-583
2023-05-15SL-19674 Disable "Blinn-Phong" when a PBR material is applied to make it ↵RunitaiLinden
clear that those buttons are inoperable until you remove the PBR material.
2023-03-23SL-19399: CleanupCosmic Linden
2023-03-22SL-19399: Reorganize controls for PBR material editing in the build floater ↵Cosmic Linden
in more sensible way. Ignore "Lock repeat" in PBR mode as it's redundant
2023-03-22SL-19399: Allow editing all PBR texture transforms at once with Complete ↵Cosmic Linden
material radio
2023-02-27Fix formatting in indra/newview/llpanelface.* filesAlexander Gavriliuk
2023-02-14Merge pull request #85 from secondlife/SL-19002cosmic-linden
SL-19002: Handle edge case in client networking which could cause material ID and overrides to become out-of-sync
2023-02-14SL-19002: Stop sending material IDs from client via material params and just ↵Cosmic Linden
call queueApply/queueModify
2023-02-14SL-19183 PBR mapping scale values start on zeroAndrey Kleshchev
2023-01-23SL-19014 Sanitize the override data sent for faces without GLTF materialsAndrey Kleshchev
2023-01-10SL-18820: Fix applying material clearing transform overrides. Loosen some ↵Cosmic Linden
asserts to allow non-default transform overrides.
2023-01-04SL-18854 Fix drag'n drop of plain textures on faces in PBR modeAndrey Kleshchev
When in PBR 'mode', defaulted texture drops to diffuse channel
2022-12-02SL-18448 When initing views and object has pbr, open pbr in texture tabAndrey Kleshchev
2022-12-02SL-18768 Disabled PBR texture transform when no PBR is setAndrey Kleshchev
2022-11-30SL-18746: Disable transparency control in build floater when the prim has a ↵Cosmic Linden
GLTF material
2022-11-29SL-18732: Review feedbackCosmic Linden
2022-11-29SL-18732: Fix texture transform controls not updating when switching which ↵Cosmic Linden
texture to edit
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-18677 Disable materials UI when materials caps are not availableAndrey Kleshchev
2022-11-16SL-18632: Un-hide planar align options when editing GLTF textures in build ↵Cosmic Linden
floater
2022-11-15SL-18632: Implement editing GLTF material texture transforms in build floaterCosmic Linden
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-11SL-18627: Make space for pbr transform controls in build floater and disable ↵Cosmic Linden
some WIP controls
2022-11-10SL-18617 Disable fullbright checkbox and color swatch when GLTF material is ↵Dave Parks
present.
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-09SL-18583 Copy&Paste support for overridesAndrey Kleshchev
And a fix for SL-18583
2022-11-07SL-18583 Fix race condition when setting multiple facesAndrey Kleshchev
And fix cases of updates not applying
2022-11-03SL-18448 Save material button in tools floaterAndrey Kleshchev
2022-11-02SL-18531 Disable texture controls when editing face with materialAndrey Kleshchev
2022-11-01SL-18448 Fix metallic and normal controls being swappedAndrey Kleshchev
2022-10-29SL-18448 Material Editor and Tools floater adjustmentsAndrey Kleshchev
1. Enable glow 2. Added buttons to texture->pbr
2022-10-28SL-17699 Blank material Id for material pickerAndrey Kleshchev
2022-10-22SL-18105 When saving an object's material to inventory, save the version ↵Dave Parks
that as overrides applied.
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-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-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-14Fix SL-17697 local_id usageBrad Kittenbrink (Brad Linden)