Merge tag 'Second_Life_Release#3d465f6c-26.3' into 26.3

1 files changed, 7 insertions, 0 deletions

diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index 6df5a80748..348cb867dd 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -253,6 +253,11 @@ bool LLTexUnit::bind(LLTexture* texture, bool for_rendering, bool forceBind)
                         texture->setActive() ;
                         texture->updateBindStatsForTester() ;
                     }
+                    // updateBindStats only stamps time; the GC and fetch gate use
+                    // the frame stamp, so stamp it here too or bind()-drawn faces
+                    // (bump/material/media) oscillate. Admin/non-camera binds are
+                    // already suppressed via LLImageGLStampBypass / sStampBindFrame.
+                    gl_tex->stampBound();
                     mHasMipMaps = gl_tex->mHasMipMaps;
                     if (gl_tex->mTexOptionsDirty)
                     {
@@ -333,6 +338,8 @@ bool LLTexUnit::bind(LLImageGL* texture, bool for_rendering, bool forceBind, S32
         glBindTexture(sGLTextureType[texture->getTarget()], mCurrTexture);
         stop_glerror();
         texture->updateBindStats();
+        // Frame-stamp fresh binds too - see bind(LLTexture*) above.
+        texture->stampBound();
         mHasMipMaps = texture->mHasMipMaps;
         if (texture->mTexOptionsDirty)
         {