summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturectrl.cpp
AgeCommit message (Collapse)Author
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-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-04-14DRTVWR-559 Add paranoia checks around typecasts of LLGLTFMaterial to ↵RunitaiLinden
LLFetchedGLTFMaterial
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
2022-06-27SL-17640 Fix texture picker not enabling 'apply now'Andrey Kleshchev
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-04-15SL-17204 FIXED The texture with full permissions is settled on the prim ↵Mnikolenko Productengine
after copying texture from the object with texture with no transfer permission
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
# Conflicts: # indra/newview/lltexturectrl.h
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 ↵andreykproductengine
conflicts
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
# Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp # indra/newview/lltexturectrl.cpp # indra/newview/skins/default/xui/de/floater_texture_ctrl.xml # indra/newview/skins/default/xui/es/floater_texture_ctrl.xml # indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/it/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml # indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml # indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-04-21Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/llviewerfloaterreg.cpp # indra/newview/skins/default/xui/de/floater_preview_texture.xml # indra/newview/skins/default/xui/es/floater_preview_texture.xml # indra/newview/skins/default/xui/fr/floater_preview_texture.xml # indra/newview/skins/default/xui/it/floater_preview_texture.xml # indra/newview/skins/default/xui/ja/panel_edit_classified.xml # indra/newview/skins/default/xui/ja/panel_me.xml # indra/newview/skins/default/xui/ru/floater_preview_texture.xml # indra/newview/skins/default/xui/tr/floater_picks.xml # indra/newview/skins/default/xui/tr/floater_preview_texture.xml # indra/newview/skins/default/xui/tr/panel_edit_classified.xml # indra/newview/skins/default/xui/tr/panel_me.xml # indra/newview/skins/default/xui/zh/floater_preview_texture.xml
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-14 17:31:21 +0000