From f6c29b0356c893a54429c8ed90c6ef90f28f51b6 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Thu, 9 Oct 2025 22:24:54 +0200 Subject: [PATCH] FIRE-35342 Show capture frame shader on screen, when relevant option is selected in snapshot floater Still no idea why guides are not working, but adding a missing setting for them, at least --- indra/newview/app_settings/settings.xml | 11 +++++++++++ .../shaders/class1/post/snapshotFrameF.glsl | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 61449e0baa..fb62a961f3 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -26587,6 +26587,17 @@ Change of this parameter will affect the layout of buttons in notification toast Value 0 + FSSnapshotShowGuides + + Comment + If enabled, shows composition guides inside the snapshot frame. + Persist + 1 + Type + Boolean + Value + 0 + FSSnapshotFrameBorderColor Comment diff --git a/indra/newview/app_settings/shaders/class1/post/snapshotFrameF.glsl b/indra/newview/app_settings/shaders/class1/post/snapshotFrameF.glsl index 1e3576d19e..651fa07665 100644 --- a/indra/newview/app_settings/shaders/class1/post/snapshotFrameF.glsl +++ b/indra/newview/app_settings/shaders/class1/post/snapshotFrameF.glsl @@ -49,10 +49,10 @@ void main() else { // Draw border around the snapshot frame - if ((tc.x >= border_rect_px.x && tc.x < frame_rect_px.x) || - (tc.x <= border_rect_px.z && tc.x > frame_rect_px.z) || - (tc.y >= border_rect_px.y && tc.y < frame_rect_px.y) || - (tc.y <= border_rect_px.w && tc.y > frame_rect_px.w)) + if ((tc.x >= border_rect_px.x && tc.x < frame_rect_px.x) || + (tc.x > frame_rect_px.z && tc.x <= border_rect_px.z) || + (tc.y >= border_rect_px.y && tc.y < frame_rect_px.y) || + (tc.y > frame_rect_px.w && tc.y <= border_rect_px.w)) { diff.rgb = mix(diff.rgb, border_color, 0.5); }