Age | Commit message (Collapse) | Author | |
---|---|---|---|
2022-10-29 | SL-17699 Hide pipette for material picker | Andrey 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-28 | SL-17699 Blank material Id for material picker | Andrey Kleshchev | |
2022-10-27 | SL-17699 Enable 'none' button it amterial picker | Andrey Kleshchev | |
2022-09-29 | SL-17653 Small change in material loading order | Andrey Kleshchev | |
2022-09-29 | SL-17653 Multi-material file support for local materials | Andrey Kleshchev | |
2022-09-15 | SL-18125 Material asset creation pulls wrong set of permissions | Andrey Kleshchev | |
2022-09-14 | SL-18044 (PBR) No-copy textures not applying to objects | Andrey Kleshchev | |
2022-09-13 | SL-17653 Removed unneeded combo box | Andrey Kleshchev | |
2022-09-01 | SL-17653 Fix combo not being visible when needed | Andrey Kleshchev | |
2022-09-01 | SL-17653 Finalized texure picker's local filtering | Andrey Kleshchev | |
2022-09-01 | SL-17653 In texture picker cleaned up permanently invisible 'show folders' ↵ | Andrey Kleshchev | |
checkbox | |||
2022-08-31 | Merge branch master (DRTVWR-483) into DRTVWR-559 | Andrey Kleshchev | |
# Conflicts: # indra/newview/lllocalbitmaps.cpp # indra/newview/lllocalbitmaps.h # indra/newview/llviewerregion.cpp # lllocalgltfmaterials.* were modified to match lllocalbitmaps* | |||
2022-08-24 | SL-17653 File filter for local materials and textures in texture picker | Andrey Kleshchev | |
2022-08-23 | SL-17653 Local gltf materials #3 | Andrey Kleshchev | |
2022-08-23 | SL-17653 Local gltf materials #2 | Andrey Kleshchev | |
2022-08-19 | https://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-17 | SL-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-17 | SL-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-04 | Merge remote-tracking branch 'origin/master' into DRTVWR-559 | Brad Kittenbrink | |
2022-08-04 | Merge branch master (DRTVWR-561) into DRTVWR-483 | Andrey Kleshchev | |
2022-06-27 | SL-17640 Fix texture picker not enabling 'apply now' | Andrey Kleshchev | |
2022-06-24 | SL-17640 Materials Upload UI #1 | Andrey Kleshchev | |
1. Allow 'none' textures 2. Disable 'apply now' buttons 3. Switch from loading dae files to just gltf glb | |||
2022-04-15 | SL-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-01 | Merge branch 'master' into DRTVWR-486 | Andrey Lihatskiy | |
2021-04-01 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
2020-09-28 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
# Conflicts: # indra/newview/lltexturectrl.h | |||
2020-09-28 | Merged master(DRTVWR-497) into DRTVWR-486 | Andrey Kleshchev | |
2020-09-28 | Merged master (DRTVWR-497) into DRTVWR-514-keymappings | Andrey Kleshchev | |
2020-09-23 | Merge branch 'master' into DRTVWR-486 | Andrey Lihatskiy | |
2020-09-23 | Merge branch 'master' into DRTVWR-483 | Andrey Lihatskiy | |
2020-09-22 | Merge branch 'master' v6.4.9 into DRTVWR-497 | Dave Houlton | |
2020-09-22 | Merged master(DRTVWR-503) into DRTVWR-514-keymappings | Andrey Kleshchev | |
2020-06-24 | SL-12688 Warnings part #2 | Andrey Kleshchev | |
2020-06-23 | SL-6109 Removed LLDrawFrustum and used changes from EEP to prevent merge ↵ | andreykproductengine | |
conflicts | |||
2020-06-23 | Backed out changeset: 19f3fa6e3e63 | andreykproductengine | |
2020-06-23 | SL-6109 Implemented LLDrawFrustum | andreykproductengine | |
2020-06-17 | SL-13359 #5 Implemented revised changes | Andrey Kleshchev | |
2020-05-05 | Buildfix | Andrey Lihatskiy | |
2020-05-05 | Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint | Andrey 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-21 | Merge branch 'master' into DRTVWR-483 | Andrey 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 | |||
2020-04-20 | Merge branch 'master' into DRTVWR-497 | Andrey Lihatskiy | |
2020-02-18 | SL-12641 Remade 'Pick: Texture' floater to eliminate translation overlaps | Andrey Kleshchev | |
2019-11-27 | Upstream merge from viewer-neko | AndreyL ProductEngine | |
2019-11-13 | Merge in from viewer-release 6.3.5 | Dave Houlton | |
2019-11-13 | Merged in lindenlab/viewer-release | AndreyL ProductEngine | |
2019-11-11 | SL-6109 Removed LLDrawFrustum and used changes from EEP to prevent merge ↵ | andreykproductengine | |
conflicts | |||
2019-11-11 | Backed out changeset: 19f3fa6e3e63 | andreykproductengine | |
2019-10-01 | SL-6109 Implemented LLDrawFrustum | andreykproductengine | |
2019-11-14 | Merged in lindenlab/viewer-release | AndreyL ProductEngine | |
2019-10-18 | SL-11840 [Bakes on Mesh] Enable bake textures to be applied to non-attached ↵ | ruslantproductengine | |
editable items - Now bake texture channel's available for assign for non attached objects |