summaryrefslogtreecommitdiff
path: root/indra/newview/llmaterialeditor.h
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 #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