diff options
author | Kitty Barnett <develop@catznip.com> | 2012-02-24 16:12:43 +0100 |
---|---|---|
committer | Kitty Barnett <develop@catznip.com> | 2012-02-24 16:12:43 +0100 |
commit | e0d1ddab212103ba11a72783ce3b0a26ea8c0c55 (patch) | |
tree | 44011ae0491941af0bfc1957d5f3b408c81123a4 /indra/newview/llmeshrepository.h | |
parent | e615660823e680e824d2db0f1a59917597e64a13 (diff) | |
parent | 289d756ea86bd3898f41592146d8f549cd056846 (diff) |
Merge with viewer-development
Diffstat (limited to 'indra/newview/llmeshrepository.h')
-rw-r--r-- | indra/newview/llmeshrepository.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index 31b84ea0d9..da81bb057b 100644 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -323,8 +323,8 @@ public: virtual void run(); void loadMeshLOD(const LLVolumeParams& mesh_params, S32 lod); - bool fetchMeshHeader(const LLVolumeParams& mesh_params); - bool fetchMeshLOD(const LLVolumeParams& mesh_params, S32 lod); + bool fetchMeshHeader(const LLVolumeParams& mesh_params, U32& count); + bool fetchMeshLOD(const LLVolumeParams& mesh_params, S32 lod, U32& count); bool headerReceived(const LLVolumeParams& mesh_params, U8* data, S32 data_size); bool lodReceived(const LLVolumeParams& mesh_params, S32 lod, U8* data, S32 data_size); bool skinInfoReceived(const LLUUID& mesh_id, U8* data, S32 data_size); @@ -441,6 +441,8 @@ public: static U32 sBytesReceived; static U32 sHTTPRequestCount; static U32 sHTTPRetryCount; + static U32 sLODPending; + static U32 sLODProcessing; static U32 sCacheBytesRead; static U32 sCacheBytesWritten; static U32 sPeakKbps; |