summaryrefslogtreecommitdiff
path: root/indra/newview/llmaterialeditor.cpp
AgeCommit message (Collapse)Author
2024-09-30Fix deprecated strstream usage with boost::iostream::array_sourceRye Cogtail
2024-07-08Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h ↵Ansariel
and llunittype.h for now
2024-07-02viewer#1666 Allow switching 2k textures off in bulk uploadsAndrey Kleshchev
2024-06-10Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into ↵Brad Linden
project/gltf_development
2024-06-04Merge remote-tracking branch 'origin/release/materials_featurette' into ↵Brad Linden
project/gltf_development
2024-06-01Re-enable a lot of compiler warnings for MSVC and address the C4267 ↵Ansariel
"possible loss of precision" warnings
2024-05-23Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into ↵Brad Linden
brad/merge-maint-a-to-dev
2024-05-22Fix line endlingsAnsariel
2024-05-22Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-AAnsariel
# Conflicts: # autobuild.xml # indra/cmake/CMakeLists.txt # indra/cmake/GoogleMock.cmake # indra/llaudio/llaudioengine_fmodstudio.cpp # indra/llaudio/llaudioengine_fmodstudio.h # indra/llaudio/lllistener_fmodstudio.cpp # indra/llaudio/lllistener_fmodstudio.h # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/llaudio/llstreamingaudio_fmodstudio.h # indra/llcharacter/llmultigesture.cpp # indra/llcharacter/llmultigesture.h # indra/llimage/llimage.cpp # indra/llimage/llimagepng.cpp # indra/llimage/llimageworker.cpp # indra/llimage/tests/llimageworker_test.cpp # indra/llmessage/tests/llmockhttpclient.h # indra/llprimitive/llgltfmaterial.h # indra/llrender/llfontfreetype.cpp # indra/llui/llcombobox.cpp # indra/llui/llfolderview.cpp # indra/llui/llfolderviewmodel.h # indra/llui/lllineeditor.cpp # indra/llui/lllineeditor.h # indra/llui/lltextbase.cpp # indra/llui/lltextbase.h # indra/llui/lltexteditor.cpp # indra/llui/lltextvalidate.cpp # indra/llui/lltextvalidate.h # indra/llui/lluictrl.h # indra/llui/llview.cpp # indra/llwindow/llwindowmacosx.cpp # indra/newview/app_settings/settings.xml # indra/newview/llappearancemgr.cpp # indra/newview/llappearancemgr.h # indra/newview/llavatarpropertiesprocessor.cpp # indra/newview/llavatarpropertiesprocessor.h # indra/newview/llbreadcrumbview.cpp # indra/newview/llbreadcrumbview.h # indra/newview/llbreastmotion.cpp # indra/newview/llbreastmotion.h # indra/newview/llconversationmodel.h # indra/newview/lldensityctrl.cpp # indra/newview/lldensityctrl.h # indra/newview/llface.inl # indra/newview/llfloatereditsky.cpp # indra/newview/llfloatereditwater.cpp # indra/newview/llfloateremojipicker.h # indra/newview/llfloaterimsessiontab.cpp # indra/newview/llfloaterprofiletexture.cpp # indra/newview/llfloaterprofiletexture.h # indra/newview/llgesturemgr.cpp # indra/newview/llgesturemgr.h # indra/newview/llimpanel.cpp # indra/newview/llimpanel.h # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryclipboard.cpp # indra/newview/llinventoryclipboard.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventoryfunctions.h # indra/newview/llinventorygallery.cpp # indra/newview/lllistbrowser.cpp # indra/newview/lllistbrowser.h # indra/newview/llpanelobjectinventory.cpp # indra/newview/llpanelprofile.cpp # indra/newview/llpanelprofile.h # indra/newview/llpreviewgesture.cpp # indra/newview/llsavedsettingsglue.cpp # indra/newview/llsavedsettingsglue.h # indra/newview/lltooldraganddrop.cpp # indra/newview/llurllineeditorctrl.cpp # indra/newview/llvectorperfoptions.cpp # indra/newview/llvectorperfoptions.h # indra/newview/llviewerparceloverlay.cpp # indra/newview/llviewertexlayer.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/macmain.h # indra/test/test.cpp
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
Drtvwr 600 maint a
2024-05-07secondlife/viewer#1333 BOOL to bool conversion leftovers: ternariesAlexander Gavriliuk
2024-05-06Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into ↵RunitaiLinden
gltf-dev-maint-a-merge
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-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
# Conflicts: # indra/newview/llappviewer.cpp # indra/newview/llfloaterchangeitemthumbnail.cpp # indra/newview/llpanelprofile.cpp # indra/newview/llselectmgr.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/lltooldraganddrop.cpp # indra/newview/llviewerdisplay.cpp # indra/newview/llvovolume.cpp
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
Release/gltf maint2
2024-01-24SL-20669 Move constants out of settings.xmlAndrey Kleshchev
UIImgInvisibleUUID doesn't exist Default normal for material is 'null'
2024-01-18Allow for upload of 2k textures (#652)RunitaiLinden
* SL-20760 Allow 2k texture uploads * SL-20760 Fix for textures not downloading.
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
# Conflicts: # indra/newview/llmaterialeditor.cpp
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 ↵RunitaiLinden
HDRI (addresses blue sheen).
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
* SL-20570 Fix for lossy (and square) normal maps when importing GLTF materials. * SL-20582 Fix for overriding to alpha mode blend not working. Incidental decruft of dead code (thanks, Rye!)
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 ↵Cosmic Linden
permissions
2023-11-09SL-20553: Save material button in build floater now depends on agent ↵Cosmic Linden
inventory rather than object inventory
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
Update editor in which texture changed to local
2023-10-17Update llmaterialeditor.cppJonathan "Geenz" Goodman
SL-20392
2023-10-17Update llmaterialeditor.cppJonathan "Geenz" Goodman
SL-20392
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 12:52:23 +0000