diff options
| author | Jacek Antonelli | 2008-08-15 23:45:04 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-08-15 23:45:04 -0500 |
| commit | 117e22047c5752352342d64e3fb7ce00a4eb8113 (patch) | |
| tree | e32de2cfba0dda8705ae528fcd1fbe23ba075685 /linden/indra/llmessage/llhttpassetstorage.cpp | |
| parent | Second Life viewer sources 1.18.0.6 (diff) | |
| download | meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.zip meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.tar.gz meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.tar.bz2 meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.tar.xz | |
Second Life viewer sources 1.18.1.2
Diffstat (limited to 'linden/indra/llmessage/llhttpassetstorage.cpp')
| -rw-r--r-- | linden/indra/llmessage/llhttpassetstorage.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linden/indra/llmessage/llhttpassetstorage.cpp b/linden/indra/llmessage/llhttpassetstorage.cpp index d83349b..b6c20b9 100644 --- a/linden/indra/llmessage/llhttpassetstorage.cpp +++ b/linden/indra/llmessage/llhttpassetstorage.cpp | |||
| @@ -38,7 +38,11 @@ | |||
| 38 | #include "llvfile.h" | 38 | #include "llvfile.h" |
| 39 | #include "llvfs.h" | 39 | #include "llvfs.h" |
| 40 | 40 | ||
| 41 | #include "zlib/zlib.h" | 41 | #ifdef LL_STANDALONE |
| 42 | # include <zlib.h> | ||
| 43 | #else | ||
| 44 | # include "zlib/zlib.h" | ||
| 45 | #endif | ||
| 42 | 46 | ||
| 43 | const U32 MAX_RUNNING_REQUESTS = 1; | 47 | const U32 MAX_RUNNING_REQUESTS = 1; |
| 44 | const F32 MAX_PROCESSING_TIME = 0.005f; | 48 | const F32 MAX_PROCESSING_TIME = 0.005f; |