From 00a193e740536bc8dbdc7a4c52ae8d75efba0037 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Thu, 14 Jul 2016 15:21:39 +0300
Subject: [PATCH] MAINT-6460 Crash calculating mesh complexity
---
indra/newview/llmeshrepository.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index bf7f91d19ad..a0e57677c32 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -4033,7 +4033,9 @@ void LLMeshRepository::uploadError(LLSD& args)
//static
F32 LLMeshRepository::getStreamingCost(LLSD& header, F32 radius, S32* bytes, S32* bytes_visible, S32 lod, F32 *unscaled_value)
{
- if (header.size() == 0 || header.has("404") || header["version"].asInteger() > MAX_MESH_VERSION)
+ if (header.has("404")
+ || !header.has("lowest_lod")
+ || (header.has("version") && header["version"].asInteger() > MAX_MESH_VERSION))
{
return 0.f;
}
--
GitLab