Merge branch 'release/26.3' into marchcat/slua-26.3

# Conflicts:
#	indra/llrender/llimagegl.cpp
#	indra/llrender/llimagegl.h
#	indra/newview/featuretable.txt
#	indra/newview/featuretable_linux.txt
#	indra/newview/featuretable_mac.txt

1 files changed, 1 insertions, 7 deletions

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index d47bf6c409..f02136789b 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -5585,13 +5585,7 @@ bool LLViewerWindow::cubeSnapshot(const LLVector3& origin, LLCubeMapArray* cubea
 
         // actually render the scene
         gCubeSnapshot = true;
-        {
-            // Probe binds aren't visibility - otherwise every probe slice re-stamps
-            // behind-camera textures and cycles them evict->refetch. RAII so the
-            // nested shadow pass in display_cube_face doesn't re-enable stamping.
-            LLImageGLStampBypass stamp_bypass;
-            display_cube_face();
-        }
+        display_cube_face();
         gCubeSnapshot = false;
     }