From b9b913a60ada97fc61bf2176e443dc72c8359ccb Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 7 Mar 2023 09:38:43 -0600
Subject: SL-19349 Fix for hang on bulk upload of materials, add bulk upload
 option to material selector, incidental decruft.

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

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

diff --git a/indra/newview/lltinygltfhelper.h b/indra/newview/lltinygltfhelper.h
index 92c9876aff..256f6c854f 100644
--- a/indra/newview/lltinygltfhelper.h
+++ b/indra/newview/lltinygltfhelper.h
@@ -43,10 +43,11 @@ namespace LLTinyGLTFHelper
 
     LLImageRaw* getTexture(const std::string& folder, const tinygltf::Model& model, S32 texture_index);
 
-    S32 getMaterialCountFromFile(const std::string& filename);
+    bool loadModel(const std::string& filename, tinygltf::Model& model_out);
 
-    bool getMaterialFromFile(
+    bool getMaterialFromModel(
         const std::string& filename,
+        const tinygltf::Model& model,
         S32 mat_index,
         LLFetchedGLTFMaterial* material,
         std::string& material_name);
-- 
cgit v1.2.3