summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturectrl.cpp
AgeCommit message (Expand)Author
2023-07-27SL-20053: Fix sometimes unable to unset a PBR material on a prim.Cosmic Linden
2023-07-27SL-19958 An inventory material without asset should default to a blank materi...Andrey Kleshchev
2023-04-14DRTVWR-559 Add paranoia checks around typecasts of LLGLTFMaterial to LLFetche...RunitaiLinden
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
2022-12-01SL-18725 Texture picker should explain why dropping texture isn't allowedAndrey Kleshchev
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
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' ch...Andrey Kleshchev
2022-08-31Merge branch master (DRTVWR-483) into DRTVWR-559Andrey Kleshchev
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 bui...Callum Prentice
2022-08-17SL-17699 Add upport for materials to texture picker. MAke sure the default (i...Callum Prentice
2022-08-17SL-17699 Add upport for materials to texture picker. A work in progress but ...Callum Prentice
2022-08-04Merge remote-tracking branch 'origin/master' into DRTVWR-559Brad Kittenbrink
2022-08-04Merge branch master (DRTVWR-561) into DRTVWR-483Andrey Kleshchev
2022-06-27SL-17640 Fix texture picker not enabling 'apply now'Andrey Kleshchev
2022-06-24SL-17640 Materials Upload UI #1Andrey Kleshchev
2022-04-15SL-17204 FIXED The texture with full permissions is settled on the prim after...Mnikolenko Productengine
2021-04-01Merge branch 'master' into DRTVWR-486Andrey Lihatskiy
2021-04-01Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-09-28Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-09-28Merged master(DRTVWR-497) into DRTVWR-486Andrey Kleshchev
2020-09-28Merged master (DRTVWR-497) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-09-23Merge branch 'master' into DRTVWR-486Andrey Lihatskiy
2020-09-23Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-09-22Merge branch 'master' v6.4.9 into DRTVWR-497Dave Houlton
2020-09-22Merged master(DRTVWR-503) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-06-24SL-12688 Warnings part #2Andrey Kleshchev
2020-06-23SL-6109 Removed LLDrawFrustum and used changes from EEP to prevent merge conf...andreykproductengine
2020-06-23Backed out changeset: 19f3fa6e3e63andreykproductengine
2020-06-23SL-6109 Implemented LLDrawFrustumandreykproductengine
2020-06-17SL-13359 #5 Implemented revised changesAndrey Kleshchev
2020-05-05BuildfixAndrey Lihatskiy
2020-05-05Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
2020-04-21Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-04-20Merge branch 'master' into DRTVWR-497Andrey Lihatskiy