diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-01-09 15:18:20 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-01-09 15:18:20 -0500 |
| commit | cdd45b9abb35b40f2a31e7433fb99e588df8b40b (patch) | |
| tree | f59f5e404f8417c8fea632592b7256c2f677b399 /indra/newview/llmeshrepository.h | |
| parent | bf55755262244c7c36df781d2e093b4109f6ecbf (diff) | |
| parent | 42a33b6c6250aca7e459f95cd13b0d0600cd6262 (diff) | |
merge changes for DRTVWR-276
Diffstat (limited to 'indra/newview/llmeshrepository.h')
| -rw-r--r-- | indra/newview/llmeshrepository.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index 6e301c26a2..8602271f84 100644 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -322,7 +322,9 @@ public: virtual void run(); + void lockAndLoadMeshLOD(const LLVolumeParams& mesh_params, S32 lod); void loadMeshLOD(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); @@ -351,6 +353,10 @@ public: // (should hold onto mesh_id and try again later if header info does not exist) bool fetchMeshPhysicsShape(const LLUUID& mesh_id); + static void incActiveLODRequests(); + static void decActiveLODRequests(); + static void incActiveHeaderRequests(); + static void decActiveHeaderRequests(); }; @@ -407,7 +413,7 @@ public: void startRequest() { ++mPendingUploads; } void stopRequest() { --mPendingUploads; } - + bool finished() { return mFinished; } virtual void run(); void preStart(); |