SL-19012: Fix new material IDs sometimes not applying when set via LSL

1 files changed, 9 insertions, 1 deletions

diff --git a/indra/newview/llfetchedgltfmaterial.h b/indra/newview/llfetchedgltfmaterial.h
index 4f6c56012e..f784f19c4f 100644
--- a/indra/newview/llfetchedgltfmaterial.h
+++ b/indra/newview/llfetchedgltfmaterial.h
@@ -39,6 +39,9 @@ public:
     LLFetchedGLTFMaterial();
     virtual ~LLFetchedGLTFMaterial();
 
+    // If this material is loaded, fire the given function
+    void onMaterialComplete(std::function<void()> material_complete);
+
     // bind this material for rendering
     void bind();
 
@@ -49,9 +52,14 @@ public:
     LLPointer<LLViewerFetchedTexture> mEmissiveTexture;
 
 protected:
-    //Lifetime management
+    // Lifetime management
+    
+    void materialBegin();
+    void materialComplete();
+
     F64 mExpectedFlusTime; // since epoch in seconds
     bool mActive;
     bool mFetching;
+    std::vector<std::function<void()>> materialCompleteCallbacks;
 };