diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-12-25 20:02:12 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-12-25 20:02:32 +0200 |
| commit | 693d9dc3bd608a5777dc8f6ac5f73b3ab796d392 (patch) | |
| tree | 222b36d46323afb235139ce73ddbd13ad75e4494 /indra/newview/llviewerassetstorage.h | |
| parent | 098c4c0371f63b2b827131a13bfc623b8cb73f25 (diff) | |
| parent | 0a873cd95547f003878c6d00d0883ff792f4a865 (diff) | |
Merge master into DRTVWR-486
Diffstat (limited to 'indra/newview/llviewerassetstorage.h')
| -rw-r--r-- | indra/newview/llviewerassetstorage.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/llviewerassetstorage.h b/indra/newview/llviewerassetstorage.h index c1a5534b81..af7fbb5fbf 100644 --- a/indra/newview/llviewerassetstorage.h +++ b/indra/newview/llviewerassetstorage.h @@ -30,18 +30,16 @@ #include "llassetstorage.h" #include "llcorehttputil.h" -class LLVFile; +class LLFileSystem; class LLViewerAssetRequest; class LLViewerAssetStorage : public LLAssetStorage { public: - LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer, - LLVFS *vfs, LLVFS *static_vfs, const LLHost &upstream_host); + LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer, const LLHost &upstream_host); - LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer, - LLVFS *vfs, LLVFS *static_vfs); + LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer); ~LLViewerAssetStorage(); |