summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelface.cpp
AgeCommit message (Collapse)Author
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)
2022-10-14WIP for SL-18103 and SL-17697 live editing of materials using ↵Brad Kittenbrink (Brad Linden)
ModifyMaterialParams cap
2022-10-13SL-18346 Fix a typoAndrey Kleshchev
2022-10-12SL-18346 Fixed tools floater not editing pbr texture offsets correctlyAndrey Kleshchev
2022-09-23SL-18134 Rename Albedo to Base Color to be more consistent with GLTF specDave Parks
2022-09-22SL-17999 'copy' functionality for 'features' and 'texture' tabsAndrey Kleshchev
And a fix to prevent message spam
2022-09-16DRTVWR-559 Fixed merge conflictsAndrey Kleshchev
2022-09-16Merge branch master (DRTVWR-571) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h
2022-09-13SL-17653 Removed unneeded combo boxAndrey Kleshchev
2022-09-05SL-17999 Small cleanupAndrey Kleshchev
2022-09-02SL-17999 PBR should reuse texture possition channels from normal materialsAndrey Kleshchev
2022-09-01SL-17653 Finalized texure picker's local filteringAndrey Kleshchev
2022-09-01SL-17999 PBR material in tool's texture tabAndrey Kleshchev
2022-08-30SL-18038 Remove placeholder "save as material" buttonDave Parks
2022-08-04Merge remote-tracking branch 'origin/master' into DRTVWR-559Brad Kittenbrink
2022-08-04DRTVWR-544 Post-merge build fixAndrey Lihatskiy
2022-08-04Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h # indra/newview/llpanelobject.cpp
2022-05-06SL-17198 more fixes to get material asset serialization working betterBrad Kittenbrink
2022-05-06SL-17198 fixes to get material asset serialization working betterBrad Kittenbrink
2022-05-06Merge remote-tracking branch 'origin/DRTVWR-559' into ↵Brad Kittenbrink
brad/SL-17116-material-messaging
2022-05-06SL-17198 material asset uploading now suuceeeds.Brad Kittenbrink (Brad Linden)
2022-05-05SL-17325 apply inventory material to faceDave Houlton
2022-04-29SL-17116, SL-17277 single-face material save onlyDave Houlton
2022-04-28Merge remote-tracking branch 'origin/euclid-17277' into ↵Brad Kittenbrink
brad/SL-17116-material-messaging
2022-04-28Beginning viewer side work for SL-17198 new asset and inventory types for ↵Brad Kittenbrink
Materials
2022-04-28Add a (broken) material upload handler fxnDave Houlton
2022-04-27Test UI for SL-17116. provide a debug interface to set a MaterialID for a faceBrad Kittenbrink
2022-04-27Prototype a SaveMaterial buttonDave Houlton
2022-04-26SL-16026 FIXED Copying only one diffuse texture allows pasting this texture ↵Mnikolenko Productengine
into other types of textures
2022-04-19SL-17231 Copying textures should be disabled if object content was not yet ↵Mnikolenko Productengine
updated
2022-04-15SL-17204 FIXED The texture with full permissions is settled on the prim ↵Mnikolenko Productengine
after copying texture from the object with texture with no transfer permission
2022-02-01SL-16344 #6 Fixed 'choose media' button not working in some casesAndrey Kleshchev
2022-01-18SL-16344 #5 CleanupAndrey Kleshchev