summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelface.cpp
AgeCommit message (Collapse)Author
2025-08-08Merge tag 'Second_Life_Release#55f1c8b9-2025.06' into 2025.06Erik Kundiman
2025-08-08Merge branch '2025.05' into 2025.06Erik Kundiman
2025-08-06Merge branch develop into 2025.06Andrey Kleshchev
# Conflicts: # indra/newview/llvoavatar.cpp
2025-07-18Merge tag 'Second_Life_Release#f5d350fb-2025.05-gltf-mesh-import' into 2025.05Erik Kundiman
2025-07-16#3964 Don't spawn CEF instances for the build toolsAndrey Kleshchev
unless strictly needed
2025-07-16#4349 fix repeats cannot be adjusted for specular when a normal map is not ↵Maxim Nikolenko
applied
2025-07-10#4349 fix repeats cannot be adjusted for specular when a normal map is not ↵Maxim Nikolenko
applied
2025-07-03Merge tag 'Second_Life_Project#bca9ba9b-glTF_Mesh_Import' into gltf_mesh_importErik Kundiman
2025-05-29Merge branch 'main' into 2025.05Erik Kundiman
2025-05-28Merge branch 'main' into marchcat/2505-mergeAndrey Lihatskiy
# Conflicts: # .github/workflows/qatest.yaml # indra/llcommon/llsdutil.h # indra/llui/llflatlistview.h # indra/newview/llinventorybridge.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitgallery.h
2025-05-28Merge remote-tracking branch 'origin/main' into geenz/2025.04-to-developJonathan "Geenz" Goodman
2025-05-22Merge tag 'Second_Life_Release#a31b7ae2-Second_Life_Release#a31b7ae-2025.04' ↵Erik Kundiman
into 2025.04
2025-05-12Revert "#4008 Fix media scale adjustments with pbr applied"Andrey Kleshchev
This reverts commit b084d842c9900e532cba11e1e5a4e85299a0e184.
2025-05-09Merge tag 'Second_Life_Release#377d1b38-2025.04' into 2025.04Erik Kundiman
2025-05-07#4008 Fix media scale adjustments with pbr appliedAndrey Kleshchev
2025-04-30Merge tag 'Second_Life_Release#d9e55c44-Second_Life_Release#d9e55c4-2025.04' ↵Erik Kundiman
into 2025.04
2025-04-29#3791 check against alpha blending as a part of determining exclude waterMaxim Nikolenko
2025-04-28viewerp#300 Fix inconsistency with copying textures vs pbrAndrey Kleshchev
2025-04-25Fix scale values not updating if they were focused and you used repeats per ↵Hecklezz
meter
2025-04-24Autofit Blinn Phong normal and specular when using repeats per meterHecklezz
2025-04-24Implemented PBR repeats per meterHecklezz
2025-04-19Merge tag 'Second_Life_Release#11cd9b9-2025.05' into 2025.05Erik Kundiman
2025-04-19Merge tag 'Second_Life_Release#9a333e65-2025.04' into 2025.04Erik Kundiman
2025-04-15Merge branch 'develop' into marchcat/05-developAndrey Lihatskiy
2025-04-15Merge branch 'main' into marchcat/maint-c-restoreAndrey Lihatskiy
# Conflicts: # indra/llcommon/lldate.h # indra/newview/llappviewer.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llmaterialeditor.cpp # indra/newview/llviewerparceloverlay.cpp # indra/newview/llvoavatar.cpp
2025-04-15Merge pull request #3911 from secondlife/mainJonathan "Geenz" Goodman
Merge 2025.03 release into develop.
2025-04-10Merge commit '9e24b30' into marchcat/maint-c/restoreAndrey Lihatskiy
# Conflicts: # indra/llmath/v2math.cpp # indra/llmath/v2math.h # indra/llmath/v3math.h # indra/llmath/v4math.h # indra/llui/llfolderviewitem.cpp # indra/llui/llfolderviewitem.h # indra/llui/llfolderviewmodel.h # indra/llui/llmodaldialog.cpp # indra/llui/lltexteditor.cpp # indra/llui/lltexteditor.h # indra/llwindow/llwindowwin32.cpp # indra/newview/llagent.cpp # indra/newview/llagentcamera.h # indra/newview/llavatarrenderinfoaccountant.cpp # indra/newview/llconversationmodel.h # indra/newview/llfloaterinventorysettings.cpp # indra/newview/llfloaternamedesc.cpp # indra/newview/llfloaternamedesc.h # indra/newview/llfloaterobjectweights.cpp # indra/newview/llfloaterobjectweights.h # indra/newview/llfolderviewmodelinventory.h # indra/newview/llinspecttexture.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventorygallery.h # indra/newview/llinventorygallerymenu.cpp # indra/newview/llinventorymodel.cpp # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h # indra/newview/llmaterialeditor.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitgallery.h # indra/newview/lloutfitslist.cpp # indra/newview/lloutfitslist.h # indra/newview/llpanelgroupcreate.cpp # indra/newview/llpanelgroupgeneral.cpp # indra/newview/llpanelobjectinventory.cpp # indra/newview/llpaneloutfitsinventory.h # indra/newview/llpanelprofile.cpp # indra/newview/llpanelwearing.cpp # indra/newview/llreflectionmap.cpp # indra/newview/llselectmgr.cpp # indra/newview/llsidepanelappearance.cpp # indra/newview/llsidepaneliteminfo.cpp # indra/newview/llteleporthistorystorage.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/lltexturefetch.cpp # indra/newview/lltexturefetch.h # indra/newview/llviewerassetupload.cpp # indra/newview/llviewercamera.cpp # indra/newview/llviewercamera.h # indra/newview/llviewermenufile.cpp # indra/newview/llviewerobject.h # indra/newview/llviewertexture.cpp # indra/newview/llviewerwindow.cpp # indra/newview/llvoavatar.cpp # indra/newview/llvoavatar.h # indra/newview/llvoavatarself.cpp # indra/newview/llvovolume.cpp # indra/newview/llvovolume.h # indra/newview/tests/llviewerassetstats_test.cpp
2025-04-02Fix normal and specular repeats per meter scalingHecklezz
2025-03-29Merge tag 'Second_Life_Release#8eff224c-2025.03' into 2025.03Erik Kundiman
2025-03-24#3780 disable water exclusion if user applies PBR or MediaMaxim Nikolenko
2025-03-22Merge tag 'Second_Life_Release#0ec9bfaa-2025.03' into 2025.03Erik Kundiman
2025-03-21Merge tag 'Second_Life_Release#895a6739-2025.03' into 2025.03Erik Kundiman
2025-03-20#3779 reset texture repeats when unchecking the Hide Water optionMaxim Nikolenko
2025-03-13#3189 Pasted PBR materials disappearingAndrey Kleshchev
2025-03-06Merge remote-tracking branch 'secondlife/release/2025.03' into 2025.03Erik Kundiman
2025-03-03#3512 Add UX for marking water exclusion surfacesMaxim Nikolenko
2025-01-23Merge remote-tracking branch 'secondlife/release/2024.12-ForeverFPS' into ↵Erik Kundiman
2024.12-ForeverFPS
2025-01-22#3450 Crash at LLViewerMediaTexture::setPlayingAndrey Kleshchev
2024-09-01Merge remote-tracking branch 'secondlife/release/2024.08-DeltaFPS' into ↵Erik Kundiman
2024.08-DeltaFPS
2024-08-09Fix copy&paste error in LLPanelFace (#2233)Ansariel Hiller
2024-08-07#1922 Make PBR scale and offset crosshair work (fix PBR channels in LLPanelFace)Alexander Gavriliuk
2024-08-07#1922 Make PBR scale and offset crosshair work (store control pointers in ↵Alexander Gavriliuk
LLPanelFace)
2024-08-07#1922 Make PBR scale and offset crosshair work (fix callbacks in LLPanelFace)Alexander Gavriliuk
2024-07-28Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into ↵Erik Kundiman
2024.06-atlasaurus
2024-07-26viewer#2102 Update feature notification to notify about FavoritesAndrey Kleshchev
and remove old notifications
2024-07-25Reduce findChild stalls in face panelRye Mutt
2024-07-08Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h ↵Ansariel
and llunittype.h for now
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-06-13Fix a few merge issuesAnsariel
2024-06-06Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into ↵Brad Linden
project/gltf_development