diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-07-15 10:15:15 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-07-15 10:15:15 -0700 |
| commit | edec2d0559905d33907380d0b304b9e28f74082e (patch) | |
| tree | 8f66c497878a24b488039f54b04f03960fbb6c96 /indra/newview/llviewerobjectlist.cpp | |
| parent | f11dd1d8a3dc4ba9a3c23563126e11ee971e219f (diff) | |
| parent | 226929f8f5b8bc1080d0082b2595d689238df2b8 (diff) | |
Merge with viewer-release
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rwxr-xr-x | indra/newview/llviewerobjectlist.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index 7f5d2ac125..7c36b30dd1 100755 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -68,7 +68,7 @@ #include "u64.h" #include "llviewertexturelist.h" #include "lldatapacker.h" -#ifdef LL_STANDALONE +#ifdef LL_USESYSTEMLIBS #include <zlib.h> #else #include "zlib/zlib.h" @@ -76,6 +76,7 @@ #include "object_flags.h" #include "llappviewer.h" +#include "llfloaterperms.h" #include "llvocache.h" extern F32 gMinObjectDistance; |