summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturectrl.h
AgeCommit message (Collapse)Author
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-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-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-02-21secondlife/viewer-issues#72: Fix clang warnings (virtual override)Cosmic Linden
2024-02-21Convert remaining BOOL to boolAnsariel
2024-02-21Convert BOOL to bool in lluiAnsariel
2024-02-20secondlife/viewer-issues#72: Clean up material preview when hidden or ↵Cosmic Linden
floater closed
2024-02-18Replace BOOL with bool in llwindow and dependent classesAnsariel
2024-01-22Merge branch 'release/materials_featurette' of github.com:secondlife/viewer ↵Cosmic Linden
into DRTVWR-592
2024-01-22Build fix for issues/22Andrey Kleshchev
2024-01-19SL-20606: Full GLTF material preview. Works for most materials.Cosmic Linden
2024-01-19Merge branch 'release/materials_featurette' into DRTVWR-592RunitaiLinden
2024-01-10SL-19555 Fix picker failing to highlight default material in inventoryAndrey Kleshchev
2023-11-30SL-20655 FIXED Texture permissions not enforced in Material floatersMaxim Nikolenko
2023-11-06SL-20523 Local textures not updating on PBR Materials #1Andrey Kleshchev
Update editor in which texture changed to local
2023-10-13DRTVWR-592: Attempt to fix Mac buildCosmic Linden
2023-10-13Merge branch 'DRTVWR-559' into DRTVWR-592Cosmic Linden
2023-10-13DRTVWR-592: (WIP) Add material terrain selection to GUICosmic Linden
2023-10-10SL-20372 Picker should remember choice of texture sourceAndrey Kleshchev
2023-10-03Merge branch 'main' (DRTVWR-567) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/VIEWER_VERSION.txt # indra/newview/llagent.cpp # indra/newview/llfloaternewfeaturenotification.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorymodel.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/llpanelmaininventory.cpp # indra/newview/llpanelmaininventory.h # indra/newview/llsidepaneltaskinfo.cpp # indra/newview/llsidepaneltaskinfo.h # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/llviewerinventory.cpp # indra/newview/llviewerobject.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llviewertexturelist.h # indra/newview/skins/default/xui/en/floater_new_feature_notification.xml # indra/newview/skins/default/xui/en/menu_inventory.xml
2023-09-25SL-20334 Unable to use non-square textures from inventoryAndrey Kleshchev
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-09-10SL-20261 Allow and resize existing textures as necessary for thumbnailsAndrey Kleshchev
2023-07-27SL-19958 An inventory material without asset should default to a blank ↵Andrey Kleshchev
material #2
2023-07-25SL-20068 Selecting from texture picker for thumbnail does not assign thumbnailAndrey Kleshchev
2023-07-22SL-20045 Texture picker should apply the exact texture inventory itemAndrey Kleshchev
2023-06-29SL-19928 Make thumbnail selection failures more user friendlyAndrey Kleshchev
2023-01-03SL-18887 Material size is not displayed in materials pickerAndrey Kleshchev
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-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-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-23SL-17653 Local gltf materials #2Andrey Kleshchev
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-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
2020-09-28Merged master(DRTVWR-497) into DRTVWR-486Andrey 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-06-24SL-12688 Warnings part #2Andrey Kleshchev
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 04:51:13 +0000