diff options
author | RunitaiLinden <davep@lindenlab.com> | 2024-02-07 11:20:06 -0600 |
---|---|---|
committer | RunitaiLinden <davep@lindenlab.com> | 2024-02-07 11:20:06 -0600 |
commit | 78cc23f89ce01eff6531d4130bdb8016296043a6 (patch) | |
tree | bc89602fc63bb40b15f76ce91b7cb6d33d4511d8 /indra/newview/llviewerdisplay.cpp | |
parent | b0c7dc653dc730f1f95aa95fc6df876dfe7b04a0 (diff) | |
parent | 7a5b0f5acf0b8aee3e73af0eb15d8c6930b98243 (diff) |
Merge branch 'release/materials_featurette' into materials_featurette/mirrors
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
-rw-r--r-- | indra/newview/llviewerdisplay.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 1d168de80d..e6d9aed1a3 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -738,8 +738,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) LL_PROFILE_ZONE_NAMED_CATEGORY_DISPLAY("display - 2") if (gResizeScreenTexture) { - gResizeScreenTexture = FALSE; gPipeline.resizeScreenTexture(); + gResizeScreenTexture = FALSE; } gGL.setColorMask(true, true); |