summaryrefslogtreecommitdiff
path: root/indra/newview/llmeshrepository.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2016-06-09 10:20:38 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2016-06-09 10:20:38 +0300
commit8d57cafed2a849cb295d600ad4b57bd2eb5057c5 (patch)
tree74529530f1f0dd14113bf2e9a3dfe23d9083be2a /indra/newview/llmeshrepository.cpp
parent325c4567a6f102533c444356d752df4a9bef99a2 (diff)
parent9177aa3bb685d942ef5dc0c4368387d4425a5f2e (diff)
Merged in lindenlab/viewer-lynx
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
-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);