SL-18908 Make media texture override base color and emissive texture on PBR materials when present.

1 files changed, 4 insertions, 1 deletions

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 02d1654878..c9fbe680c7 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -5220,13 +5220,16 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep,
     if (gltf_mat != nullptr)
     {
         mat_id = gltf_mat->getHash(); // TODO: cache this hash
+        if (!facep->hasMedia())
+        { // no media texture, face texture will be unused
+            tex = nullptr;
+        }
     }
     else
     {
         mat = facep->getTextureEntry()->getMaterialParams().get();
         if (mat)
         {
-            //mat_id = facep->getTextureEntry()->getMaterialID().asUUID();
             mat_id = facep->getTextureEntry()->getMaterialParams()->getHash();
         }
     }