diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-08-16 17:51:11 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-08-16 17:51:11 -0400 |
| commit | 53187303436d06038e40c5938219863c0d75ae5f (patch) | |
| tree | 9518405e84ff57c99d283d22b282fe2280833d80 /indra/newview/llmeshrepository.h | |
| parent | 402a2de7651105d63693deb2872dd6646dd1bd85 (diff) | |
FIX SH-859, SH-1274 - added fix for determining triangle count and
performance tested impact of animated textures
Also did some cleanup to ensure branch built and ran properly after
last merge.
Diffstat (limited to 'indra/newview/llmeshrepository.h')
| -rwxr-xr-x | indra/newview/llmeshrepository.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index 35a7314cd5..31b84ea0d9 100755 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -445,7 +445,7 @@ public: static U32 sCacheBytesWritten; static U32 sPeakKbps; - static F32 getStreamingCost(LLSD& header, F32 radius, S32* bytes = NULL, S32* visible_bytes = NULL, S32 detail = -1); + static F32 getStreamingCost(LLSD& header, F32 radius, S32* bytes = NULL, S32* visible_bytes = NULL, S32 detail = -1, F32 *unscaled_value = NULL); LLMeshRepository(); @@ -464,7 +464,7 @@ public: S32 getActualMeshLOD(const LLVolumeParams& mesh_params, S32 lod); static S32 getActualMeshLOD(LLSD& header, S32 lod); - const LLMeshSkinInfo* getSkinInfo(const LLUUID& mesh_id, LLVOVolume* requesting_obj); + const LLMeshSkinInfo* getSkinInfo(const LLUUID& mesh_id, const LLVOVolume* requesting_obj); LLModel::Decomposition* getDecomposition(const LLUUID& mesh_id); void fetchPhysicsShape(const LLUUID& mesh_id); bool hasPhysicsShape(const LLUUID& mesh_id); |