diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-20 17:37:44 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-20 17:37:44 +0300 |
| commit | 2da402498f64b982edfe2ba6545780a16731ad34 (patch) | |
| tree | b71b69e1e634266b7e5bc3e4d2a910d1798202f6 /indra/llmessage/llhttpassetstorage.h | |
| parent | 3c45631cbc4b1f26143f05e9a58f0349679e663a (diff) | |
| parent | 5952fbca316ba1d1e4243bf5ebd6dc647e4957f4 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llmessage/llhttpassetstorage.h')
| -rw-r--r-- | indra/llmessage/llhttpassetstorage.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llmessage/llhttpassetstorage.h b/indra/llmessage/llhttpassetstorage.h index 231437dad4..3e85e898e2 100644 --- a/indra/llmessage/llhttpassetstorage.h +++ b/indra/llmessage/llhttpassetstorage.h @@ -48,13 +48,14 @@ class LLHTTPAssetStorage : public LLAssetStorage { public: LLHTTPAssetStorage(LLMessageSystem *msg, LLXferManager *xfer, - LLVFS *vfs, const LLHost &upstream_host, + LLVFS *vfs, LLVFS *static_vfs, + const LLHost &upstream_host, const std::string& web_host, const std::string& local_web_host, const std::string& host_name); LLHTTPAssetStorage(LLMessageSystem *msg, LLXferManager *xfer, - LLVFS *vfs, + LLVFS *vfs, LLVFS *static_vfs, const std::string& web_host, const std::string& local_web_host, const std::string& host_name); |