SL-18105 Add mechanism for applying overrides that were received before associated ViewerObject was ready to receive them.

1 files changed, 10 insertions, 0 deletions

diff --git a/indra/newview/llgltfmateriallist.h b/indra/newview/llgltfmateriallist.h
index 4b905e32c9..ee32dc8825 100644
--- a/indra/newview/llgltfmateriallist.h
+++ b/indra/newview/llgltfmateriallist.h
@@ -48,10 +48,20 @@ public:
     void flushMaterials();
 
     static void registerCallbacks();
+
+    // save an override update for later (for example, if an override arrived for an unknown object)
+    void queueOverrideUpdate(const LLUUID& id, S32 side, LLGLTFMaterial* override_data);
+
+    void applyQueuedOverrides(LLViewerObject* obj);
+
 private:
     typedef std::unordered_map<LLUUID, LLPointer<LLFetchedGLTFMaterial > > uuid_mat_map_t;
     uuid_mat_map_t mList;
 
+    typedef std::vector<LLPointer<LLGLTFMaterial> > override_list_t;
+    typedef std::unordered_map<LLUUID, override_list_t > queued_override_map_t;
+    queued_override_map_t mQueuedOverrides;
+
     LLUUID mLastUpdateKey;
 };