summaryrefslogtreecommitdiff
path: root/indra/newview/llmaterialeditor.cpp
AgeCommit message (Collapse)Author
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 #3Andrey Kleshchev
2022-08-23SL-17653 Local gltf materials #2Andrey Kleshchev
2022-08-23SL-17653 Basic local gltf materialsAndrey Kleshchev
2022-08-15Fix for SL-17695 'Give materials and textures imported by Material Editor a ↵Callum Prentice
sensible name' - compile error on mac/clang because it's more picky - as it should be in this case
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-10SL-17695 Sensible names for material properties - sanitize the various names ↵Callum Linden
we use to store inventory items using a built in function
2022-08-09SL-17695 minor cleanup pass to make the PR a bit easier to readCallum Linden
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-08-08SL-17653 Apply selection to faces and linkset instead of just first objectAndrey Kleshchev
2022-08-02SL-17653 Fix live material preview not workingAndrey Kleshchev
Material was immediately dropped due to not having an id. This is a placeholder untill build floater gets a proper way to select materials.
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-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-17685 Drag and drop material supportDave Parks
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-27SL-17640 Fix name usage, fix "apply now"Andrey Kleshchev
This reverts commit 231c618a844cee26a3779b703c88d8807df872e6, instead color swatched get enabled 'apply now' in xml.
2022-06-27Merge remote-tracking branch 'origin/DRTVWR-559' into ↵Brad Kittenbrink
brad/SL-17602-new-material-upload
2022-06-27Initial pass at SL-17602 saving material to inventory from material editor ↵Brad Kittenbrink
floater.
2022-06-27SL-17653 Make changes in material editor apply to selection immediately and ↵Dave Parks
enable "apply now" checkbox in color swatches.
2022-06-25SL-17640 Materials Upload UI #3Andrey Kleshchev
Fixed issues in button layout Added 'unsaved changes' notification
2022-06-24Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-06-24SL-17658 Make Material Importer strip alpha channels and repack occlusion as ↵Dave Parks
needed.
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 Flip imported GLTF textures, remove .dae and .glb/.gltf from file ↵Dave Parks
dialogs that don't support them
2022-06-23SL-17653 WIP - Apply GLTF material in Material Editor to selected object ↵Dave Parks
when you click "Save"
2022-06-16SL-17619 Add support for embedded textures to GLTF importerDave Parks
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