summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturectrl.cpp
AgeCommit message (Collapse)Author
2024-05-15Post-merge spaces fixAndrey Lihatskiy
2024-03-18secondlife/viewer#1006: Move blank material constant to indra_constants.hCosmic Linden
2024-02-20secondlife/viewer-issues#72: Clean up material preview when hidden or ↵Cosmic Linden
floater closed
2024-02-09Put PBR material swatch behind feature flag (#775)cosmic-linden
* secondlife/viewer#771: Put PBR material swatch behind feature flag * secondlife/viewer#771: Make viewer respect PBRMaterialSwatchEnabled from SimulatorFeatures
2024-01-30Merge pull request #703 from secondlife/release/gltf-maint2RunitaiLinden
Release/gltf maint2
2024-01-25Fix material preview sometimes not updating when transitioning from blank ↵Cosmic Linden
material to non-blank material
2024-01-24SL-20669 Move constants out of settings.xmlAndrey Kleshchev
UIImgInvisibleUUID doesn't exist Default normal for material is 'null'
2024-01-22Merge branch 'release/materials_featurette' of github.com:secondlife/viewer ↵Cosmic Linden
into DRTVWR-592
2024-01-22Build fix for issues/22Andrey Kleshchev
2024-01-19SL-20606: Full GLTF material preview. Works for most materials.Cosmic Linden
2024-01-19Merge branch 'release/materials_featurette' into DRTVWR-592RunitaiLinden
2024-01-10SL-19555 Fix picker failing to highlight default material in inventoryAndrey Kleshchev
2023-11-30SL-20655 FIXED Texture permissions not enforced in Material floatersMaxim Nikolenko
2023-11-15Merge remote-tracking branch 'remotes/origin/DRTVWR-559' into DRTVWR-596RunitaiLinden
2023-11-14SL-18343: Simple interim GLTF material preview - base color only (#511)cosmic-linden
2023-11-06SL-20523 Local textures not updating on PBR Materials #1Andrey Kleshchev
Update editor in which texture changed to local
2023-10-13Merge branch 'DRTVWR-559' into DRTVWR-592Cosmic Linden
2023-10-13DRTVWR-592: (WIP) Add material terrain selection to GUICosmic Linden
2023-10-10SL-20372 Picker should remember choice of texture sourceAndrey Kleshchev
2023-10-07SL-20386 Fix default material recognition in picker's inventoryAndrey Kleshchev
2023-10-03D559 Post merge fixesAndrey Kleshchev
2023-10-03Merge branch 'main' (DRTVWR-567) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/VIEWER_VERSION.txt # indra/newview/llagent.cpp # indra/newview/llfloaternewfeaturenotification.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorymodel.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/llpanelmaininventory.cpp # indra/newview/llpanelmaininventory.h # indra/newview/llsidepaneltaskinfo.cpp # indra/newview/llsidepaneltaskinfo.h # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/llviewerinventory.cpp # indra/newview/llviewerobject.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llviewertexturelist.h # indra/newview/skins/default/xui/en/floater_new_feature_notification.xml # indra/newview/skins/default/xui/en/menu_inventory.xml
2023-09-28SL-19958 Fix default material not droping into texture ctrlAndrey Kleshchev
2023-09-25SL-20334 Unable to use non-square textures from inventoryAndrey Kleshchev
2023-09-19SL-5522 Fix applying textuers and materials with limited restrictions to ↵Andrey Kleshchev
attachments 1. Texture picker now updates filter's permissions based on selection 2. Various panels now properly check permissions
2023-09-10SL-20261 Allow and resize existing textures as necessary for thumbnailsAndrey Kleshchev
2023-07-27SL-20053: Fix sometimes unable to unset a PBR material on a prim.Cosmic Linden
Caused by inventory item asset IDs being null. Seems suspicious. But working around it for now seems best.
2023-07-27SL-19958 An inventory material without asset should default to a blank ↵Andrey Kleshchev
material #2
2023-07-27SL-20080 Show warning message when selecting a non square texture for thumbnailsMnikolenko Productengine
2023-07-25SL-20068 Selecting from texture picker for thumbnail does not assign thumbnailAndrey Kleshchev
2023-07-22SL-20045 Texture picker should apply the exact texture inventory itemAndrey Kleshchev
2023-06-30SL-19929 Picker's warning small adjustmentAndrey Kleshchev
2023-06-29SL-19928 Make thumbnail selection failures more user friendlyAndrey Kleshchev
2023-04-14DRTVWR-559 Add paranoia checks around typecasts of LLGLTFMaterial to ↵RunitaiLinden
LLFetchedGLTFMaterial
2023-04-11SL-19533 Don't try to restart fetchexcessivelyAndrey Kleshchev
No real point restarting, but due to significant changes decided to keep this around and raise asserts instead of removing.
2023-02-16SL-17640 Fix 'Apply now' being enabled when importingAndrey Kleshchev
2023-01-03SL-18887 Material size is not displayed in materials pickerAndrey Kleshchev
2022-12-07SL-18197 Materials folder doesn't appear on loginAndrey Kleshchev
Fix some folders not being requested unless already cached. Fix materials folder not being requested by materials picker.
2022-12-01SL-18725 Texture picker should explain why dropping texture isn't allowedAndrey Kleshchev
Show a tooltip on drag&drop
2022-12-01SL-18648 Clean up unused mNonImmediateFilterPermMaskAndrey Kleshchev
2022-11-16SL-17699 Fixed drag and drop into material pickerAndrey Kleshchev
2022-10-29SL-17699 Hide pipette for material pickerAndrey Kleshchev
At the moment there is no specification how it should work, it can't work like it does for textures due to material overrides. Also removed some dead code
2022-10-28SL-17699 Blank material Id for material pickerAndrey Kleshchev
2022-10-27SL-17699 Enable 'none' button it amterial pickerAndrey 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-15SL-18125 Material asset creation pulls wrong set of permissionsAndrey Kleshchev
2022-09-14SL-18044 (PBR) No-copy textures not applying to objectsAndrey Kleshchev
2022-09-13SL-17653 Removed unneeded combo boxAndrey Kleshchev
2022-09-01SL-17653 Fix combo not being visible when neededAndrey Kleshchev
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-23 18:24:21 +0000