diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-12-26 14:00:00 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-12-26 14:00:00 +0200 |
commit | b33e18585dc6579ada2b6b7560d648194985c4c5 (patch) | |
tree | e05f147c800d7e60e4abb3b72e14d467f8cae1f6 /indra/newview/llviewertexture.cpp | |
parent | 981cdca0a5f874fb02694ae5bb39c99784762481 (diff) | |
parent | 0a873cd95547f003878c6d00d0883ff792f4a865 (diff) |
Merge branch 'master' into DRTVWR-483
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
-rw-r--r-- | indra/newview/llviewertexture.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 7fbc4d789b..075588d577 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -39,8 +39,6 @@ #include "llimagej2c.h" #include "llimagetga.h" #include "llstl.h" -#include "llvfile.h" -#include "llvfs.h" #include "message.h" #include "lltimer.h" |