diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-05-23 11:35:23 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-05-23 11:35:23 -0700 |
| commit | 9f6849e081deac1f62ab3010ee0984e17749c9e6 (patch) | |
| tree | 8d916206343d075fc85e90e83ec9dabe8b01376d /indra/llfilesystem | |
| parent | a1f49564d670a2c41bfa25c833bba2564b9b7f48 (diff) | |
| parent | 03c4458bdcc6821a3047f93b729d412e274ab9af (diff) | |
Merge remote-tracking branch 'origin/project/gltf_development' into brad/merge-maint-a-to-dev
Diffstat (limited to 'indra/llfilesystem')
| -rw-r--r-- | indra/llfilesystem/lldiskcache.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llfilesystem/lldiskcache.cpp b/indra/llfilesystem/lldiskcache.cpp index 54e49ebcb8..da2e960ed3 100644 --- a/indra/llfilesystem/lldiskcache.cpp +++ b/indra/llfilesystem/lldiskcache.cpp @@ -222,6 +222,8 @@ const std::string LLDiskCache::assetTypeToString(LLAssetType::EType at) { LLAssetType::AT_MESH, "MESH" }, { LLAssetType::AT_SETTINGS, "SETTINGS" }, { LLAssetType::AT_MATERIAL, "MATERIAL" }, + { LLAssetType::AT_GLTF, "GLTF" }, + { LLAssetType::AT_GLTF_BIN, "GLTF_BIN" }, { LLAssetType::AT_UNKNOWN, "UNKNOWN" } }; |