summaryrefslogtreecommitdiff
path: root/indra/newview/llmaterialeditor.h
AgeCommit message (Collapse)Author
2022-11-08SL-18583 Make Live Material editor restore changes when canceling in texture ↵Andrey Kleshchev
or color pickers
2022-11-03SL-18548 fix for crash when trying to Save material without capsMnikolenko Productengine
2022-11-03SL-18446 Don't cause excessive udpates #2Andrey Kleshchev
2022-11-02SL-18448 Make material editor's scroll smarterAndrey Kleshchev
2022-11-01SL-18448 Modified Material Editor to match overrides betterAndrey Kleshchev
2022-10-31SL-18448 Do not show editor when saving material inworld, only a name promptAndrey Kleshchev
2022-10-31SL-18446 Material override arrival filteringAndrey Kleshchev
2022-10-29SL-18446 Material override arrival for selected objects should update ↵Andrey Kleshchev
material editor
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-26SL-18446 Terse-update selection set from live material editor #1Andrey Kleshchev
2022-10-26SL-18444 Live Material Editor updating with selectionAndrey Kleshchev
2022-10-24SL-18414 Smarter material editor's cancel for overridesAndrey 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-18SL-18008 Mac build fixAndrey Kleshchev
2022-10-18SL-18008 Updated Save and Edit PBR buttonsAndrey Kleshchev
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 Add Save and Edit buttons to right click menu for materialsAndrey Kleshchev
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-08SL-18326 GLTF material functionality in a NotecardAndrey Kleshchev
2022-09-29SL-17653 Small change in material loading orderAndrey Kleshchev
2022-09-29SL-17653 Multi-material file support for local materialsAndrey Kleshchev
2022-09-28SL-18233 Double clicking material in an object shows notecardAndrey Kleshchev
2022-09-27SL-17640 Support loading materials from multi-material filesAndrey Kleshchev
2022-09-26SL-17640 Material editor permissions supportAndrey Kleshchev
2022-09-23SL-18134 Rename Albedo to Base Color to be more consistent with GLTF specDave Parks
2022-08-30SL-17987 Fix for material editor not initializing to GLTF defaults when ↵Dave Parks
loading a null material asset.
2022-08-23SL-17653 Local gltf materials #2Andrey Kleshchev
2022-08-10Merged in DRTVWR-559-SL-17695 (pull request #1089)Callum Linden
SL-17695 Give materials and textures imported by Material Editor a sensible name - first pass - likely need to be refined but may be good enough for now Approved-by: Andrey Kleshchev Approved-by: Dave Parks
2022-08-08SL-17695 Give materials and textures imported by Material Editor a sensible ↵Callum Linden
name - first pass - likely need to be refined but may be good enough for now
2022-08-09SL-17653 Perially done restoration functionalityAndrey Kleshchev
2022-07-29DRTVWR-559: Revert "Revert "Fix minor Mac build issues.""Nat Goodspeed
Try to reapply the original commit in such a way that it can be pushed. This reverts commit eaebe8fe70985f6d25cf883867f19617164ead81.
2022-07-29DRTVWR-559: Revert "Fix minor Mac build issues."Nat Goodspeed
Somehow this commit got into my local repository without showing up as a new commit relative to bitbucket. Try double-reverting it. This is the first one. This reverts commit 7772b5639a9bae2c4fbbcd2575355404c4bdca55.
2022-07-20SL-17690 Uploaded material asset references wrong texture UUIDsAndrey Kleshchev
Upload textures first, then get ids and upload material on callback
2022-07-19SL-17640 Check account balance before uploadingAndrey Kleshchev
2022-07-14DRTVWR-559 fix mac build againBrad Kittenbrink
2022-07-06SL-17640 'Save As' should create a new itemAndrey Kleshchev
Also fixed floater not using inventory item's name, some of the permissions
2022-06-30SL-17640 Handle unsaved changes betterAndrey Kleshchev
2022-06-30SL-17640 Use LLAgentBenefitsMgr for upload costAndrey Kleshchev
2022-06-29SL-17602 WIP - Texture uploads form material editor now work but the names ↵Dave Parks
are garbage and the resulting material asset has the wrong UUIDs
2022-06-28SL-17379 More complete integration of material asset typeDave Parks
2022-06-25SL-17640 Materials Upload UI #3Andrey Kleshchev
Fixed issues in button layout Added 'unsaved changes' notification
2022-06-24SL-17640 Materials Upload UI #2Andrey Kleshchev
New Fee fields New Buttons
2022-06-24SL-17640 Materials Upload UI #1Andrey Kleshchev
1. Allow 'none' textures 2. Disable 'apply now' buttons 3. Switch from loading dae files to just gltf glb
2022-06-23SL-17653 WIP - Apply GLTF material in Material Editor to selected object ↵Dave Parks
when you click "Save"
2022-06-15SL-17605 WIP - Upload->Material now lets you pick a GLTF file and imports ↵Dave Parks
the first material in the GLTF file to the Material Editor
2022-06-14SL-17586 WIP -- LLMaterialEditor prototype and "New Material" inventory buttons.Dave Parks