summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturectrl.cpp
AgeCommit message (Collapse)Author
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵Andrey Lihatskiy
LF, and trim trailing whitespaces as needed
2024-01-24SL-20669 Move constants out of settings.xmlAndrey Kleshchev
UIImgInvisibleUUID doesn't exist Default normal for material is 'null'
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-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
2022-09-01SL-17653 Finalized texure picker's local filteringAndrey Kleshchev
2022-09-01SL-17653 In texture picker cleaned up permanently invisible 'show folders' ↵Andrey Kleshchev
checkbox
2022-08-31Merge branch master (DRTVWR-483) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/lllocalbitmaps.cpp # indra/newview/lllocalbitmaps.h # indra/newview/llviewerregion.cpp # lllocalgltfmaterials.* were modified to match lllocalbitmaps*
2022-08-24SL-17653 File filter for local materials and textures in texture pickerAndrey Kleshchev
2022-08-23SL-17653 Local gltf materials #3Andrey Kleshchev
2022-08-23SL-17653 Local gltf materials #2Andrey Kleshchev
2022-08-19https://jira.secondlife.com/browse/SL-17699 Integrate GLTF materials with ↵Callum Prentice
build floater texture tab: First pass - some edge cases remaining. User can now edit an object or set of objects, choose a material and have it apply as expected
2022-08-17SL-17699 Add upport for materials to texture picker. MAke sure the default ↵Callum Prentice
(index 0) option is selected and update filters accordingly at startup
2022-08-17SL-17699 Add upport for materials to texture picker. A work in progress but ↵Callum Prentice
I am about to make some larger changes to inventory code so I wanted to secure this first
2022-08-04Merge remote-tracking branch 'origin/master' into DRTVWR-559Brad Kittenbrink
2022-08-04Merge branch master (DRTVWR-561) into DRTVWR-483Andrey Kleshchev