summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelface.h
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-02-09Merge branch 'release/materials_featurette' into release/gltf-maint2Brad Linden
2024-02-02Issue #26 Support texture drop onto PBR materialsAndrey Kleshchev
2024-01-24Merge remote-tracking branch 'origin/release/materials_featurette' into ↵Jonathan "Geenz" Goodman
DRTVWR-583
2023-11-09SL-20553: Save material button in build floater now depends on agent ↵Cosmic Linden
inventory rather than object inventory
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: Show loading message when inventory permissions are loadingCosmic Linden
2023-08-11SL-20024: (WIP) (untested) Fix GLTF material permissions in some more edge casesCosmic Linden
2023-08-11SL-20024: Put material in object inventory when material is no-modify or ↵Cosmic Linden
no-transfer
2023-08-10SL-20133 Shift clicking selected face leaves Editor's Texture tab in a weird ↵Andrey Kleshchev
state
2023-07-27SL-18396 PBR and blinn phong should not be allowed to be edited togetherAndrey Kleshchev
2023-07-17Merge branch 'DRTVWR-559' into DRTVWR-583Jonathan "Geenz" Goodman
2023-07-17Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-06-27Just about got hero reflection maps working.Jonathan "Geenz" Goodman
DRTVWR-583
2023-02-28D580 Fix coding policy failuresAndrey Kleshchev
2023-02-27Fix formatting in indra/newview/llpanelface.* filesAlexander Gavriliuk
2023-02-14SL-19183 PBR mapping scale values start on zeroAndrey Kleshchev
2023-01-04SL-18854 Fix drag'n drop of plain textures on faces in PBR modeAndrey Kleshchev
When in PBR 'mode', defaulted texture drops to diffuse channel
2022-11-29SL-18732: Fix clang build errorCosmic Linden
2022-11-29SL-18732: Review feedbackCosmic Linden
2022-11-29SL-18732: Fix flickering of control values when changing GLTF texture ↵Cosmic Linden
transforms in build floater
2022-11-15SL-18632: Implement editing GLTF material texture transforms in build floaterCosmic Linden
2022-11-11SL-18627: Make space for pbr transform controls in build floater and disable ↵Cosmic Linden
some WIP controls
2022-11-03SL-18448 Save material button in tools floaterAndrey Kleshchev
2022-10-29SL-18448 Material Editor and Tools floater adjustmentsAndrey Kleshchev
1. Enable glow 2. Added buttons to texture->pbr
2022-10-14WIP for SL-18103 and SL-17697 live editing of materials using ↵Brad Kittenbrink (Brad Linden)
ModifyMaterialParams cap
2022-09-16Merge branch master (DRTVWR-571) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h
2022-09-01SL-17999 PBR material in tool's texture tabAndrey Kleshchev
2022-08-04Merge remote-tracking branch 'origin/master' into DRTVWR-559Brad Kittenbrink
2022-08-04DRTVWR-544 Post-merge build fixAndrey Lihatskiy
2022-08-04Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h # indra/newview/llpanelobject.cpp
2022-05-06SL-17198 fixes to get material asset serialization working betterBrad Kittenbrink
2022-05-05SL-17325 apply inventory material to faceDave Houlton
2022-04-28Merge remote-tracking branch 'origin/euclid-17277' into ↵Brad Kittenbrink
brad/SL-17116-material-messaging
2022-04-28Beginning viewer side work for SL-17198 new asset and inventory types for ↵Brad Kittenbrink
Materials
2022-04-27Test UI for SL-17116. provide a debug interface to set a MaterialID for a faceBrad Kittenbrink
2022-04-27Prototype a SaveMaterial buttonDave Houlton
2022-04-19SL-17231 Copying textures should be disabled if object content was not yet ↵Mnikolenko Productengine
updated
2022-02-01SL-16344 #6 Fixed 'choose media' button not working in some casesAndrey Kleshchev
2022-01-18SL-16344 #5 CleanupAndrey Kleshchev
2022-01-17SL-16344 #4 Only load 'title' media if it is neededAndrey Kleshchev
Mostly for the sake of MAC. setVolume(0) doesn't work on MAC which resulted in invisible media playing in background when editor was open.
2022-01-17SL-16344 #3 Moved LLPanelFace related code into LLPanelFaceAndrey Kleshchev
2020-06-23SL-12688 Warnings part #1Andrey Kleshchev
2020-06-19SL-13359 #9 Texture tabAndrey Kleshchev
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 18:01:38 +0000