diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2025-05-29 20:20:29 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-29 20:20:29 +0300 |
| commit | be40d20bca15b97ccba557dc530fe55a92456ebf (patch) | |
| tree | c560054dcb64de2559c859d850c39b372dc18a88 | |
| parent | 3375fb1348de8768ea3cac4b06cd4fdd4fbd13a9 (diff) | |
#4190 provide unsupported extension info in log
| -rw-r--r-- | indra/newview/gltf/asset.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/gltf/asset.h | 2 | ||||
| -rw-r--r-- | indra/newview/gltf/llgltfloader.cpp | 11 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_model_preview.xml | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/indra/newview/gltf/asset.cpp b/indra/newview/gltf/asset.cpp index 6576904874..3859bdc103 100644 --- a/indra/newview/gltf/asset.cpp +++ b/indra/newview/gltf/asset.cpp @@ -495,7 +495,7 @@ bool Asset::prep() if (ExtensionsSupported.find(extension) == ExtensionsSupported.end()) { LL_WARNS() << "Unsupported extension: " << extension << LL_ENDL; - mUnsupportedExtension = true; + mUnsupportedExtensions.push_back(extension); } } diff --git a/indra/newview/gltf/asset.h b/indra/newview/gltf/asset.h index 3a20f7d6ea..a22de4d59d 100644 --- a/indra/newview/gltf/asset.h +++ b/indra/newview/gltf/asset.h @@ -396,7 +396,7 @@ namespace LL U32 mMaterialsUBO = 0; bool mLoadIntoVRAM = false; - bool mUnsupportedExtension = false; + std::vector<std::string> mUnsupportedExtensions; // prepare for first time use bool prep(); diff --git a/indra/newview/gltf/llgltfloader.cpp b/indra/newview/gltf/llgltfloader.cpp index f16efe2ff1..2461a878fb 100644 --- a/indra/newview/gltf/llgltfloader.cpp +++ b/indra/newview/gltf/llgltfloader.cpp @@ -127,10 +127,19 @@ bool LLGLTFLoader::OpenFile(const std::string &filename) return false; } - if (mGLTFAsset.mUnsupportedExtension) + if (mGLTFAsset.mUnsupportedExtensions.size() > 0) { LLSD args; args["Message"] = "UnsupportedExtension"; + std::string del; + std::string ext; + for (auto& extension : mGLTFAsset.mUnsupportedExtensions) + { + ext += del; + ext += extension; + del = ","; + } + args["EXT"] = ext; mWarningsArray.append(args); } diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml index d326cbde3b..c0cddf0984 100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -62,7 +62,7 @@ <string name="ParsingErrorNoScene">Document has no visual_scene</string> <string name="ParsingErrorPositionInvalidModel">Unable to process mesh without position data. Invalid model.</string> <string name="InvalidGeometryNonTriangulated">Invalid geometry: GLTF files must contain triangulated meshes only.</string> - <string name="UnsupportedExtension">Model uses unsupported extension, related material properties are ignored.</string> + <string name="UnsupportedExtension">Model uses unsupported extension, related material properties are ignored: [EXT]</string> <panel follows="top|left" |