diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-04-19 10:13:49 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-04-19 10:13:49 -0400 |
| commit | c5e338f240422cc10d0e90c514a427c9ec4a1bd3 (patch) | |
| tree | 12a8c3b8a56e4c7132b6a2cf8a222a6d1fbbc2ec /indra/newview/llviewerassetstorage.h | |
| parent | 35168862f5ecc06166fbd1a9bcd601ae2abbf75b (diff) | |
| parent | 695e4bc17126baa282c7f27e8ac9ef1c3323fa77 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerassetstorage.h')
| -rw-r--r-- | indra/newview/llviewerassetstorage.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerassetstorage.h b/indra/newview/llviewerassetstorage.h index 512b590a1b..8e7ea3471d 100644 --- a/indra/newview/llviewerassetstorage.h +++ b/indra/newview/llviewerassetstorage.h @@ -42,10 +42,10 @@ class LLViewerAssetStorage : public LLAssetStorage { public: LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer, - LLVFS *vfs, const LLHost &upstream_host); + LLVFS *vfs, LLVFS *static_vfs, const LLHost &upstream_host); LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer, - LLVFS *vfs); + LLVFS *vfs, LLVFS *static_vfs); using LLAssetStorage::storeAssetData; virtual void storeAssetData( |