diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2021-12-15 17:06:24 -0800 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2021-12-15 17:06:24 -0800 |
| commit | 1e6caa69e6576a87bb0b1b782bffdd0697fa0c2d (patch) | |
| tree | 38f8f0136381a2e7f2b8fcba82d9781bdfab9273 /indra/newview/llviewertexture.cpp | |
| parent | 95e2f6286c140b6d3a7562a7e73f70d0ab60685b (diff) | |
| parent | 0a873cd95547f003878c6d00d0883ff792f4a865 (diff) | |
Merge remote-tracking branch 'origin/master' into brad/DRTVWR-550-mfa
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" |