From 136149d1a196d2c0c15b9977937e64ccd26c1a49 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 30 May 2025 03:06:33 +0300
Subject: #4191 skip loading model compressed with Draco

---
 indra/newview/gltf/asset.cpp | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'indra/newview/gltf/asset.cpp')

diff --git a/indra/newview/gltf/asset.cpp b/indra/newview/gltf/asset.cpp
index 3859bdc103..8c9f77686a 100644
--- a/indra/newview/gltf/asset.cpp
+++ b/indra/newview/gltf/asset.cpp
@@ -50,6 +50,10 @@ namespace LL
             "KHR_texture_transform"
         };
 
+        static std::unordered_set<std::string> ExtensionsIgnored = {
+            "KHR_materials_pbrSpecularGlossiness"
+        };
+
         Material::AlphaMode gltf_alpha_mode_to_enum(const std::string& alpha_mode)
         {
             if (alpha_mode == "OPAQUE")
@@ -494,10 +498,21 @@ bool Asset::prep()
     {
         if (ExtensionsSupported.find(extension) == ExtensionsSupported.end())
         {
-            LL_WARNS() << "Unsupported extension: " << extension << LL_ENDL;
-            mUnsupportedExtensions.push_back(extension);
+            if (ExtensionsIgnored.find(extension) == ExtensionsIgnored.end())
+            {
+                LL_WARNS() << "Unsupported extension: " << extension << LL_ENDL;
+                mUnsupportedExtensions.push_back(extension);
+            }
+            else
+            {
+                mIgnoredExtensions.push_back(extension);
+            }
         }
     }
+    if (mUnsupportedExtensions.size() > 0)
+    {
+        return false;
+    }
 
     // do buffers first as other resources depend on them
     for (auto& buffer : mBuffers)
-- 
cgit v1.2.3