From d1b21bb970ea37192e719baa2874d4dd955b86b6 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 20 Oct 2022 19:06:14 +0300
Subject: SL-18391 Fix local gltf materials to retain a copy of material

---
 indra/newview/lllocalgltfmaterials.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/lllocalgltfmaterials.h b/indra/newview/lllocalgltfmaterials.h
index f762dcc2ce..097f2ea30a 100644
--- a/indra/newview/lllocalgltfmaterials.h
+++ b/indra/newview/lllocalgltfmaterials.h
@@ -34,6 +34,7 @@ class LLScrollListCtrl;
 class LLGLTFMaterial;
 class LLViewerObject;
 class LLViewerFetchedTexture;
+class LLFetchedGLTFMaterial;
 
 class LLLocalGLTFMaterial
 {
@@ -53,7 +54,7 @@ public:
     bool updateSelf();
 
 private:
-    bool loadMaterial(LLPointer<LLGLTFMaterial> raw, S32 index);
+    bool loadMaterial();
 
 private: /* private enums */
     enum ELinkStatus
@@ -80,7 +81,9 @@ private: /* members */
     S32         mUpdateRetries;
     S32         mMaterialIndex; // Single file can have more than one
 
-    // material needs to maintain textures
+    // Maintain textures and material pointers to
+    // make sure they won't be deleted in any way
+    LLPointer<LLFetchedGLTFMaterial> mGLTFMaterial;
     LLPointer<LLViewerFetchedTexture> mBaseColorFetched;
     LLPointer<LLViewerFetchedTexture> mNormalFetched;
     LLPointer<LLViewerFetchedTexture> mMRFetched;
-- 
cgit v1.2.3