summaryrefslogtreecommitdiff
path: root/indra/newview/llgltfmateriallist.h
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-11-09 22:45:20 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-11-09 22:52:30 +0200
commita83a4811b51472b5f760861b6a8acde5fc3bd43b (patch)
tree8ff80b4728ac58b9159176a90126475ba35bc94a /indra/newview/llgltfmateriallist.h
parent14d901f25fdc10df871a60294eefcf4b9fb00931 (diff)
SL-18518 Move json to material work to background thread
Diffstat (limited to 'indra/newview/llgltfmateriallist.h')
-rw-r--r--indra/newview/llgltfmateriallist.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llgltfmateriallist.h b/indra/newview/llgltfmateriallist.h
index e035d2108d..2dae11d2ca 100644
--- a/indra/newview/llgltfmateriallist.h
+++ b/indra/newview/llgltfmateriallist.h
@@ -26,6 +26,8 @@
#pragma once
+#include "llassettype.h"
+#include "llextendedstatus.h"
#include "llfetchedgltfmaterial.h"
#include "llgltfmaterial.h"
#include "llpointer.h"
@@ -69,6 +71,15 @@ public:
void queueOverrideUpdate(const LLUUID& id, S32 side, LLGLTFMaterial* override_data);
void applyQueuedOverrides(LLViewerObject* obj);
+
+protected:
+ static void onAssetLoadComplete(
+ const LLUUID& asset_uuid,
+ LLAssetType::EType type,
+ void* user_data,
+ S32 status,
+ LLExtStat ext_status);
+
private:
typedef std::unordered_map<LLUUID, LLPointer<LLFetchedGLTFMaterial > > uuid_mat_map_t;
uuid_mat_map_t mList;