summaryrefslogtreecommitdiff
path: root/indra/newview/llmaterialeditor.cpp
AgeCommit message (Expand)Author
2024-06-10Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into project/gltf_de...Brad Linden
2024-06-04Merge remote-tracking branch 'origin/release/materials_featurette' into proje...Brad Linden
2024-06-01Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible...Ansariel
2024-05-23Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-main...Brad Linden
2024-05-22Fix line endlingsAnsariel
2024-05-22Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-AAnsariel
2024-05-21viewer#1520 Material upload floater displays wrong upload feeAndrey Kleshchev
2024-05-15Post-merge spaces fixAndrey Lihatskiy
2024-05-07Merge pull request #1421 from secondlife/DRTVWR-600-maint-ADave Parks
2024-05-07secondlife/viewer#1333 BOOL to bool conversion leftovers: ternariesAlexander Gavriliuk
2024-05-06Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-...RunitaiLinden
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ...Andrey Lihatskiy
2024-04-12viewer#1081 2K texture apload price arrives as an array #2Andrey Kleshchev
2024-04-01viewer#1081 Account for 2K texture upload price in bulk uploadAndrey Kleshchev
2024-04-01viewer#1081 Account for 2K texture upload price in material and texture uploadAndrey Kleshchev
2024-03-27Merge branch 'main' into DRTVWR-600-maint-AAndrey Lihatskiy
2024-03-18secondlife/viewer#1006: Move blank material constant to indra_constants.hCosmic Linden
2024-02-21Convert remaining BOOL to boolAnsariel
2024-02-21Convert BOOL to bool in lluiAnsariel
2024-01-30Merge pull request #703 from secondlife/release/gltf-maint2RunitaiLinden
2024-01-24SL-20669 Move constants out of settings.xmlAndrey Kleshchev
2024-01-18Allow for upload of 2k textures (#652)RunitaiLinden
2024-01-16SL-20669 Material editor uses incorect blank normal mapsAndrey Kleshchev
2024-01-10Build fix for Visual Studio update (std::vector<PermissionBit>)Alexander Gavriliuk
2024-01-08Merge branch 'main' into DRTVWR-600-maint-AAndrey Lihatskiy
2023-12-21SL-20743 Use LLMutex in LLImageBase for internal data thread-safetyAlexander Gavriliuk
2023-12-20DRTVWR-600 windows build fixAlexander Gavriliuk
2023-12-19SL-20754 Modify default midday to be a better approximation of Cloud Layers H...RunitaiLinden
2023-12-15SL-20734 Uploaded Materials should use 'Uploads' permissionsAndrey 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-13Drtvwr 596 11/8/2023 (#501)RunitaiLinden
2023-11-09SL-20553: Fix new material item still sometimes not updating in UICosmic Linden
2023-11-09SL-20553: Fix assertCosmic Linden
2023-11-09SL-20553: Permissions touch-upCosmic Linden
2023-11-09SL-20553: Clean up dead codeCosmic Linden
2023-11-09SL-20553: Fix save material to inventory not working with new agent-based per...Cosmic Linden
2023-11-09SL-20553: Save material button in build floater now depends on agent inventor...Cosmic Linden
2023-11-06SL-20570 Fix for lossy (and square) normal maps when importing GLTF materials.RunitaiLinden
2023-11-06SL-20523 Ensure override gets updated before render materialAndrey Kleshchev
2023-11-06SL-20523 Local textures not updating on PBR Materials #5Andrey Kleshchev
2023-11-06SL-20523 Local textures not updating on PBR Materials #4Andrey Kleshchev
2023-11-06SL-20523 Local textures not updating on PBR Materials #3Andrey Kleshchev
2023-11-06SL-20523 Local textures not updating on PBR Materials #2Andrey Kleshchev
2023-11-06SL-20523 Local textures not updating on PBR Materials #1Andrey Kleshchev
2023-10-17Update llmaterialeditor.cppJonathan "Geenz" Goodman
2023-10-17Update llmaterialeditor.cppJonathan "Geenz" Goodman
2023-10-13SL-20464 Don't allow enetring non-unicode material nameMaxim Nikolenko
2023-10-03D559 Post merge fixesAndrey Kleshchev
2023-09-28SL-20343 Material floater was disconnected from object's faceAndrey Kleshchev
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 23:37:56 +0000