diff options
author | Rider Linden <rider@lindenlab.com> | 2016-08-17 12:42:14 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2016-08-17 12:42:14 -0700 |
commit | d258fe40353642b20524ef320b70e6b9bf0f8ec4 (patch) | |
tree | 40918499d2a59dcbbac51f7d24930c174537fe27 /indra/newview/llmeshrepository.h | |
parent | 1edf48a0c763dee0f5d274ede6ab82d8d9b30246 (diff) | |
parent | 4fb100ac7a33174883184f1320d0beac08ead3a7 (diff) |
Merge
Diffstat (limited to 'indra/newview/llmeshrepository.h')
-rw-r--r-- | indra/newview/llmeshrepository.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index d35c44397b..a762042597 100644 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -475,6 +475,7 @@ public: static LLDeadmanTimer sQuiescentTimer; // Time-to-complete-mesh-downloads after significant events + F32 getStreamingCost(LLUUID mesh_id, F32 radius, S32* bytes = NULL, S32* visible_bytes = NULL, S32 detail = -1, F32 *unscaled_value = NULL); static F32 getStreamingCost(LLSD& header, F32 radius, S32* bytes = NULL, S32* visible_bytes = NULL, S32 detail = -1, F32 *unscaled_value = NULL); LLMeshRepository(); |