diff options
| author | richard <none@none> | 2009-12-17 10:03:56 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-12-17 10:03:56 -0800 |
| commit | 724f5fbb7f7b101774c0cf3ff43bb98f9cc4ffc1 (patch) | |
| tree | bfb7b4009b32761f9f760f97dd97cc0697667a71 /indra/newview/llviewerassetstorage.cpp | |
| parent | 9ff869a6b287a2b4b8c94219584d1c7b66ebb399 (diff) | |
| parent | cf63ce4dc1176d9df4fe852821e4a6d32332f7c6 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerassetstorage.cpp')
| -rw-r--r-- | indra/newview/llviewerassetstorage.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llviewerassetstorage.cpp b/indra/newview/llviewerassetstorage.cpp index a041f3ac98..bb49804aff 100644 --- a/indra/newview/llviewerassetstorage.cpp +++ b/indra/newview/llviewerassetstorage.cpp @@ -32,12 +32,13 @@ #include "llviewerprecompiledheaders.h" -#include "linden_common.h" - -#include "llagent.h" #include "llviewerassetstorage.h" + #include "llvfile.h" #include "llvfs.h" +#include "message.h" + +#include "llagent.h" LLViewerAssetStorage::LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer, LLVFS *vfs, const LLHost &upstream_host) |