diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-09 21:59:04 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-09 21:59:04 +0200 |
| commit | 28d4ac1cdc8e21460152e70ee347ca22b9caaf9a (patch) | |
| tree | 75eee84887a34d962226b3512489d6169aca3c0d /indra/newview/llviewerassetstorage.h | |
| parent | 367be4d1888dd0b60100350b2190bbee93d5ac9e (diff) | |
| parent | 88d837c16e768c5262073a7df965066d4bd8842c (diff) | |
Merge branch 'master' into DRTVWR-486
Diffstat (limited to 'indra/newview/llviewerassetstorage.h')
| -rw-r--r-- | indra/newview/llviewerassetstorage.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llviewerassetstorage.h b/indra/newview/llviewerassetstorage.h index 972c89de34..ef01d179b7 100644 --- a/indra/newview/llviewerassetstorage.h +++ b/indra/newview/llviewerassetstorage.h @@ -30,16 +30,18 @@ #include "llassetstorage.h" #include "llcorehttputil.h" -class LLFileSystem; +class LLVFile; class LLViewerAssetRequest; class LLViewerAssetStorage : public LLAssetStorage { public: - LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer, const LLHost &upstream_host); + LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer, + LLVFS *vfs, LLVFS *static_vfs, const LLHost &upstream_host); - LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer); + LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer, + LLVFS *vfs, LLVFS *static_vfs); ~LLViewerAssetStorage(); |