diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-02 21:41:46 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-02 21:41:46 +0200 |
| commit | 9c8bc82ce6202de525e89491b8113951074f89cb (patch) | |
| tree | c09d311bfbc2062d90bd8991fc983904c52079fa /indra/newview/llviewertexture.cpp | |
| parent | 4a2f7c82cc6c9628f6be6b4e322b172478d65b9c (diff) | |
| parent | 2b385841f3031d599bdb226f0f859e51b09870f8 (diff) | |
Merge branch 'master' into DRTVWR-518-ui
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 20a22ba45e..d69ab1b110 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" |