diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-06 13:01:12 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-06 13:01:12 -0500 |
| commit | 43eae437980226d62898c5f6fdb2a068f3b3c49b (patch) | |
| tree | 64912b2398a34b9474e481d2d26f1afb124e7351 /indra/newview/llviewerobjectlist.cpp | |
| parent | 9185f1e25602bb9bc4c2bf7923f2743effa281fa (diff) | |
| parent | a0f668c0a382ad4bd7a9be703bbcf1edd2bcf460 (diff) | |
merge changes for storm-68
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rwxr-xr-x | indra/newview/llviewerobjectlist.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index b4e287c446..b7a4510bac 100755 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -76,6 +76,7 @@ #include "object_flags.h" #include "llappviewer.h" +#include "llfloaterperms.h" extern F32 gMinObjectDistance; extern BOOL gAnimateTextures; |