SL-18458 Fix for one failure mode of overrides getting applied before base material is set.

1 files changed, 6 insertions, 3 deletions

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 237f9e34a0..7be9394364 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -5670,6 +5670,12 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 				continue;
 			}
 
+            // HACK -- brute force this check every time a drawable gets rebuilt
+            for (S32 i = 0; i < drawablep->getNumFaces(); ++i)
+            {
+                vobj->updateTEMaterialTextures(i);
+            }
+
             // apply any pending material overrides
             gGLTFMaterialList.applyQueuedOverrides(vobj);
 
@@ -5754,9 +5760,6 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 				{
 					continue;
 				}
-
-                // HACK -- brute force this check every time a drawable gets rebuilt
-                vobj->updateTEMaterialTextures(i);
 #if 0
 #if LL_RELEASE_WITH_DEBUG_INFO
                 const LLUUID pbr_id( "49c88210-7238-2a6b-70ac-92d4f35963cf" );