summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2016-06-03 20:09:33 +0300
committerandreykproductengine <akleshchev@productengine.com>2016-06-03 20:09:33 +0300
commitaca2dab2d0ff7d66576b5d79f34eb9a706187de4 (patch)
tree735cbf9ea4bd49e92bb824fa55e29f2a142f48d7 /indra
parent02cf29d1e77e35ff6b4e8c9aeb19b4a8ef5098a4 (diff)
MAINT-6460 Crash calculating mesh complexity
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llmeshrepository.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 0aaed3e286..117507ef39 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -4034,6 +4034,11 @@ 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)
+ {
+ return 0.f;
+ }
+
F32 max_distance = 512.f;
F32 dlowest = llmin(radius/0.03f, max_distance);