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

# Conflicts:
#	.github/workflows/build.yaml
#	autobuild.xml
#	indra/llcommon/llsys.cpp
#	indra/llrender/llimagegl.cpp
#	indra/llrender/llimagegl.h
#	indra/newview/CMakeLists.txt
#	indra/newview/featuretable.txt
#	indra/newview/featuretable_linux.txt
#	indra/newview/featuretable_mac.txt
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoiceclient.cpp
#	indra/newview/llvoicevivox.cpp
#	indra/newview/viewer_manifest.py

1 files changed, 22 insertions, 2 deletions

diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index 5a2b1c719c..b67b7e2bff 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -750,9 +750,29 @@ void LLFeatureManager::applyBaseMasks()
     {
         maskFeatures("VRAMGT512");
     }
-    if (gGLManager.mVRAM < 2048)
+
+    // Texture quality is driven by detected VRAM. Feature masks take the MIN
+    // of applied values, so cascading lower tiers downgrade RenderTextureQuality:
+    //   <= 2GB -> Low(0), <= 4GB -> Medium(1), < 8GB -> High(2), >= 8GB -> Ultra(3).
+    // When VRAM cannot be detected (mVRAM == 0, common on Linux) fall back to Medium.
+    if (gGLManager.mVRAM == 0)
     {
-        maskFeatures("VRAMLT2GB");
+        maskFeatures("VRAMLT4GB");
+    }
+    else
+    {
+        if (gGLManager.mVRAM < 8192)
+        {
+            maskFeatures("VRAMLT8GB");
+        }
+        if (gGLManager.mVRAM <= 4096)
+        {
+            maskFeatures("VRAMLT4GB");
+        }
+        if (gGLManager.mVRAM <= 2048)
+        {
+            maskFeatures("VRAMLT2GB");
+        }
     }
     if (!gGLManager.mHasAnisotropic || 2.f > gGLManager.mMaxAnisotropy)
     {