diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2021-03-08 13:56:16 +0000 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2021-03-08 13:56:16 +0000 |
commit | c83e740ef94e16ba85574454f3138905edecb029 (patch) | |
tree | 6e10779ff7b2df5194a3df9d100ba28d53883166 /indra/newview/llviewertexture.cpp | |
parent | 2b385841f3031d599bdb226f0f859e51b09870f8 (diff) |
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing
changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
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" |