summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelface.cpp
AgeCommit message (Collapse)Author
2024-06-14Merge branch 'release/maint-b' into marchcat/b-mergeAndrey Lihatskiy
# Conflicts: # .github/workflows/build.yaml # indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl # indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl # indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl # indra/newview/llfilepicker.cpp
2024-05-15Post-merge spaces fixAndrey Lihatskiy
2024-05-15Merge branch 'main' into marchcat/x-b-mergeAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/cmake/ConfigurePkgConfig.cmake # indra/cmake/ICU4C.cmake # indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp # indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h # indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h # indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp # indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h # indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp # indra/newview/llappviewerlinux_api.h # indra/newview/llappviewerlinux_api_dbus.cpp # indra/newview/llappviewerlinux_api_dbus.h # indra/newview/llfloateremojipicker.cpp # indra/newview/lloutfitslist.cpp
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-05Linux viewer (ReleaseOS) resurrection (#1099)Nicky Dasmijn
Co-authored-by: AiraYumi <aira.youme@airanyumi.net>
2024-03-18secondlife/viewer#1006: Move blank material constant to indra_constants.hCosmic Linden
2024-02-09Merge branch 'release/materials_featurette' into release/gltf-maint2Brad Linden
2024-02-02Issue #26 Support texture drop onto PBR materialsAndrey Kleshchev
2024-01-30Merge pull request #703 from secondlife/release/gltf-maint2RunitaiLinden
Release/gltf maint2
2024-01-26SL-20669 Fix missed uuidAndrey Kleshchev
2024-01-24Merge remote-tracking branch 'origin/release/materials_featurette' into ↵Jonathan "Geenz" Goodman
DRTVWR-583
2024-01-24SL-20669 Move constants out of settings.xmlAndrey Kleshchev
UIImgInvisibleUUID doesn't exist Default normal for material is 'null'
2024-01-10SL-19555 Fix picker failing to highlight default material in inventoryAndrey Kleshchev
2024-01-05SL-20748 Fix library materials not being previewable on an objectAndrey Kleshchev
2023-12-14SL-20715 Mask cutoff not copied corretly in build toolsAndrey Kleshchev
2023-12-13SL-20715 Mapping mode and specular color not copied correctlyAndrey Kleshchev
and fixed diffuse alpha
2023-12-08SL-20701 FIXED Build tool texture tab shows incorrect material parameters in ↵Maxim Nikolenko
some cases
2023-11-30SL-20655 FIXED Texture permissions not enforced in Material floatersMaxim Nikolenko
2023-11-29SL-20647 don't allow dragging 'no mod' material into the picker of an ↵Maxim Nikolenko
attached object
2023-11-17SL-20553: Fix crash in ~PBRPickerAgentListenerCosmic Linden
2023-11-09SL-20553: Save material button in build floater now depends on agent ↵Cosmic Linden
inventory rather than object inventory
2023-10-30SL-20541 Reorder radio buttons in Edit tools Texture tab to match order in a ↵Maxim Nikolenko
Material
2023-09-29Merge branch 'DRTVWR-559' into DRTVWR-583Jonathan "Geenz" Goodman
2023-09-28SL-20343 Material floater was disconnected from object's faceAndrey Kleshchev
2023-09-26SL-20338 FIXED Texture tab Material drop-down does not change if same ↵Maxim Nikolenko
numbered face is selected
2023-09-25Merge branch 'DRTVWR-559' into DRTVWR-583Jonathan "Geenz" Goodman
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-09Merge branch 'DRTVWR-559' into DRTVWR-583Jonathan "Geenz" Goodman
2023-09-06SL-20167: Also check permission on paste to be certainCosmic Linden
2023-09-01SL-20167: Grey out the clipboard when copying the material to clipboard is ↵Cosmic Linden
not allowed
2023-08-29Merge branch 'DRTVWR-559' into DRTVWR-583Jonathan "Geenz" Goodman
2023-08-29Add protocol level mirror support, and UI.Jonathan "Geenz" Goodman
2023-08-21SL-20145 GLTF specific feature notificationAndrey Kleshchev
2023-08-11SL-20024: Double-check object inventory is not pending when save button pressedCosmic Linden
2023-08-11SL-20024: Show loading message when inventory permissions are loadingCosmic Linden
2023-08-11SL-20024: Fix material edit/save buttons on build floater sometimes not ↵Cosmic Linden
re-enabling after object inventory load
2023-08-11SL-20024: (WIP) (untested) Fix GLTF material permissions in some more edge casesCosmic Linden
2023-08-11SL-20024: (WIP) (not tested) Improved behavior for saving material to ↵Cosmic Linden
inventory. Check perms, keep perms.
2023-08-11SL-20024: Do not show material preview for no-modify materialsCosmic Linden
2023-08-11SL-20024: Put material in object inventory when material is no-modify or ↵Cosmic Linden
no-transfer
2023-08-10SL-20039 "Save to inventory" should only allow saving identical facesAndrey Kleshchev
2023-08-10SL-20133 Shift clicking selected face leaves Editor's Texture tab in a weird ↵Andrey Kleshchev
state
2023-08-03SL-19303 switch automatically between Materials/PBR/Media based on current ↵Maxim Nikolenko
values
2023-07-31Merge branch 'DRTVWR-559' into DRTVWR-583Jonathan "Geenz" Goodman
2023-07-27SL-18396 PBR and blinn phong should not be allowed to be edited togetherAndrey Kleshchev
2023-07-18Fix for irradiance breaking.Jonathan "Geenz" Goodman
Still need to fix the problem with individual faces getting tossed around though. Will work on that tomorrow. DRTVWR-583
2023-07-17Delete unprintable chars that accidentally got into the merge in kdiff3 for ↵Brad Linden
DRTVWR-559
2023-07-17Merge branch 'DRTVWR-559' into DRTVWR-583Jonathan "Geenz" Goodman
2023-07-17Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-07-11SL-19141 Fixed applying a no-copy texture to two objects failing silentlyAndrey Kleshchev
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-16 17:32:58 +0000