diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-09 21:59:14 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-09 21:59:14 +0200 |
commit | 9a36df576313e98144deb95b28ed845c768c9960 (patch) | |
tree | 41fb30d95a6b4a4e033b41179f1787666215c05e /indra/newview/llviewertexture.cpp | |
parent | f271ba32774bae67754cb2c8144549aed9301012 (diff) | |
parent | 88d837c16e768c5262073a7df965066d4bd8842c (diff) |
Merge branch 'master' into DRTVWR-514-keymappings
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
-rw-r--r-- | indra/newview/llviewertexture.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index d69ab1b110..20a22ba45e 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -39,6 +39,8 @@ #include "llimagej2c.h" #include "llimagetga.h" #include "llstl.h" +#include "llvfile.h" +#include "llvfs.h" #include "message.h" #include "lltimer.h" |