livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#4291 Uploading without a .bin silently fails

master
Andrey Kleshchev 2025-06-26 20:43:06 +03:00 committed by Andrey Kleshchev
parent 8c9d0c6145
commit 895db142ee
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/gltf/llgltfloader.cpp
View File

@ -129,6 +129,20 @@ bool LLGLTFLoader::OpenFile(const std::string &filename)
if (!mGltfLoaded)
{
notifyUnsupportedExtension(true);
for (const auto& buffer : mGLTFAsset.mBuffers)
{
if (buffer.mByteLength > 0 && buffer.mData.empty())
{
bool bin_file = buffer.mUri.ends_with(".bin");
LLSD args;
args["Message"] = bin_file ? "ParsingErrorMissingBufferBin" : "ParsingErrorMissingBuffer";
args["BUFFER_NAME"] = buffer.mName;
args["BUFFER_URI"] = buffer.mUri;
mWarningsArray.append(args);
}
}
setLoadState(ERROR_PARSING);
return false;
}

4
indra/newview/skins/default/xui/en/floater_model_preview.xml
View File

@ -14,7 +14,7 @@
legacy_header_height="25">
<string name="status_idle"></string>
<string name="status_parse_error">Error: Dae parsing issue - see log for details.</string>
<string name="status_parse_error">Error: Model parsing issue - see log for details.</string>
<string name="status_bind_shape_orientation">Warning: bind shape matrix is not in standard X-forward orientation.</string>
<string name="status_material_mismatch">Error: Material of model is not a subset of reference model.</string>
<string name="status_reading_file">Loading...</string>
@ -75,6 +75,8 @@
<string name="FailedToCreateTempFile">Failed to create temporary file for embedded [TEXTURE_TYPE] texture [TEXTURE_INDEX]: [TEMP_FILE]</string>
<string name="SkinJointsOverLimit">Skin [SKIN_INDEX] defines [JOINT_COUNT] compatible joints, maximum is: [MAX]. Unused joints will be stripped on per model basis.</string>
<string name="ModelTooManyJoint">Model [MODEL_NAME] uses [JOINT_COUNT], maximum: [MAX], upload might fail</string>
<string name="ParsingErrorMissingBuffer">Buffer is either missing or empty [BUFFER_NAME].</string>
<string name="ParsingErrorMissingBufferBin">Buffer is either missing or empty. Check presence of [BUFFER_URI] file.</string>
<panel
follows="top|left"