Merge branch 'main' into 26.4

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 6729e20420..80b395e773 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -5175,6 +5175,7 @@ bool LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
 
     // if not showing ui, use full window to render world view
     updateWorldViewRect(!show_ui);
+    gResizeScreenTexture = false;
 
     // Copy screen to a buffer
     // crop sides or top and bottom, if taking a snapshot of different aspect ratio
@@ -5206,8 +5207,7 @@ bool LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
     F32 scale_factor = 1.0f ;
     if (!keep_window_aspect || (image_width > window_width) || (image_height > window_height))
     {
-        if ((image_width <= gGLManager.mGLMaxTextureSize && image_height <= gGLManager.mGLMaxTextureSize) &&
-            (image_width > window_width || image_height > window_height) && LLPipeline::sRenderDeferred && !show_ui)
+        if ((image_width <= gGLManager.mGLMaxTextureSize && image_height <= gGLManager.mGLMaxTextureSize) && LLPipeline::sRenderDeferred && !show_ui)
         {
             U32 color_fmt = type == LLSnapshotModel::SNAPSHOT_TYPE_DEPTH ? GL_DEPTH_COMPONENT : GL_RGBA;
             if (scratch_space.allocate(image_width, image_height, color_fmt, true))
@@ -5215,7 +5215,7 @@ bool LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
                 original_width = gPipeline.mRT->deferredScreen.getWidth();
                 original_height = gPipeline.mRT->deferredScreen.getHeight();
 
-                if (gPipeline.allocateScreenBuffer(image_width, image_height))
+                if (gPipeline.allocateScreenBuffer(image_width, image_height, 1))
                 {
                     window_width = image_width;
                     window_height = image_height;
@@ -5488,7 +5488,7 @@ bool LLViewerWindow::simpleSnapshot(LLImageRaw* raw, S32 image_width, S32 image_
     U32 color_fmt = GL_RGBA;
     if (scratch_space.allocate(image_width, image_height, color_fmt, true))
     {
-        if (gPipeline.allocateScreenBuffer(image_width, image_height))
+        if (gPipeline.allocateScreenBuffer(image_width, image_height, 1))
         {
             mWorldViewRectRaw.set(0, image_height, image_width, 0);