From 32c24ffbd7395be67ec6d59a00c68165ec8d8318 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 27 Mar 2024 14:44:22 +0100
Subject: Fix merge issues

---
 indra/newview/llviewerdisplay.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llviewerdisplay.cpp')

diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index ed803080c9..f8f466be45 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -730,8 +730,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);
-- 
cgit v1.3