diff options
author | Callum Prentice <callum@lindenlab.com> | 2021-03-10 11:59:23 -0800 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2021-03-10 11:59:23 -0800 |
commit | 45af049a479928208a1ad30a90c1db6be1969f9a (patch) | |
tree | e40aabda6866b3ca163e0ffe86127fd49332278a /indra/newview/llviewertexture.cpp | |
parent | b1add74c31cfd28c1e671470991254b4545fb573 (diff) | |
parent | 88d837c16e768c5262073a7df965066d4bd8842c (diff) |
Merge branch 'master' into DRTVWR-531
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" |