diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:43:26 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:43:26 -0500 |
| commit | 05810f063dbe0ed87d03ea41c7d8fdc423945c6e (patch) | |
| tree | 311355a1679ef47fa1951788319e0c521a188edd /indra/newview/llviewerassetstorage.h | |
| parent | 5e376017858f6534163b0bfb6b385bdd0aeac5d3 (diff) | |
| parent | e4591a85182133811e327b579c558bb3db80d79e (diff) | |
merge changes for storm-737
Diffstat (limited to 'indra/newview/llviewerassetstorage.h')
| -rw-r--r-- | indra/newview/llviewerassetstorage.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llviewerassetstorage.h b/indra/newview/llviewerassetstorage.h index 6346b79f03..ca9b9943fa 100644 --- a/indra/newview/llviewerassetstorage.h +++ b/indra/newview/llviewerassetstorage.h @@ -63,6 +63,17 @@ public: bool is_priority = false, bool user_waiting=FALSE, F64 timeout=LL_ASSET_STORAGE_TIMEOUT); + +protected: + using LLAssetStorage::_queueDataRequest; + + // virtual + void _queueDataRequest(const LLUUID& uuid, + LLAssetType::EType type, + void (*callback) (LLVFS *vfs, const LLUUID&, LLAssetType::EType, void *, S32, LLExtStat), + void *user_data, + BOOL duplicate, + BOOL is_priority); }; #endif |