diff options
| author | Ansariel <none@none> | 2019-10-17 00:20:36 +0200 |
|---|---|---|
| committer | Ansariel <none@none> | 2019-10-17 00:20:36 +0200 |
| commit | ea54b59ddd21796002af1c7b5289148373d36005 (patch) | |
| tree | 52cc85db90d7ff1ebdddb42ef940cf75a5ac98ff | |
| parent | c7747d2a1bba6ac62e9b540a283ae2c9f4bfd221 (diff) | |
Fix broken merge
| -rw-r--r-- | indra/newview/llmeshrepository.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index fc3f2fefb4..31e3d408d7 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -2504,6 +2504,7 @@ void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, bool include_textures) if (model_name.empty()) model_name = "mesh model"; result["name"] = model_name; + res["metric"] = "MUT_Unspecified"; result["asset_resources"] = res; dump_llsd_to_file(result,make_dump_name("whole_model_",dump_num)); @@ -3177,8 +3178,7 @@ void LLMeshHeaderHandler::processData(LLCore::BufferArray * /* body */, S32 /* b if (header_bytes > 0 && !header.has("404") - && header.has("version") - && header["version"].asInteger() <= MAX_MESH_VERSION) + && (!header.has("version") || header["version"].asInteger() <= MAX_MESH_VERSION)) { std::stringstream str; |