From 32984b56ea8fa4f4357379a40627b5e9267d7543 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 24 Nov 2022 12:16:59 +0200
Subject: SL-18701 llsd is not thread safe, parse it before using

---
 indra/newview/llgltfmateriallist.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'indra/newview/llgltfmateriallist.h')

diff --git a/indra/newview/llgltfmateriallist.h b/indra/newview/llgltfmateriallist.h
index 805b477248..0f0edf7414 100644
--- a/indra/newview/llgltfmateriallist.h
+++ b/indra/newview/llgltfmateriallist.h
@@ -35,6 +35,7 @@
 #include <unordered_map>
 
 class LLFetchedGLTFMaterial;
+class LLGLTFOverrideCacheEntry;
 
 class LLGLTFMaterialList
 {
@@ -89,10 +90,7 @@ public:
     // any override data that arrived before the object was ready to receive it
     void applyQueuedOverrides(LLViewerObject* obj);
 
-    // takes both the parsed message and its raw text to avoid unnecessary re serialization
-    static void writeCacheOverrides(LLSD const & message, std::string const & llsdRaw);
-
-    static void loadCacheOverrides(std::string const & message_raw);
+    static void loadCacheOverrides(const LLGLTFOverrideCacheEntry& override);
 
 private:
     friend class LLGLTFMaterialOverrideDispatchHandler;
-- 
cgit v1.2.3