diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-02 21:43:01 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-02 21:43:01 +0200 |
| commit | 2172a6102c6af6d2d748db1246dc3066221fbb84 (patch) | |
| tree | fd96c21070ca8b402c12da8c835a837e2f4692f5 /indra/newview/llviewertexlayer.cpp | |
| parent | 811d2fcb1ea8952b5e06dac0afffb835a952938f (diff) | |
| parent | 2b385841f3031d599bdb226f0f859e51b09870f8 (diff) | |
Merge branch 'master' into DRTVWR-527-maint
Diffstat (limited to 'indra/newview/llviewertexlayer.cpp')
| -rw-r--r-- | indra/newview/llviewertexlayer.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llviewertexlayer.cpp b/indra/newview/llviewertexlayer.cpp index c501dd0035..4c2fbcf837 100644 --- a/indra/newview/llviewertexlayer.cpp +++ b/indra/newview/llviewertexlayer.cpp @@ -31,8 +31,6 @@ #include "llagent.h" #include "llimagej2c.h" #include "llnotificationsutil.h" -#include "llvfile.h" -#include "llvfs.h" #include "llviewerregion.h" #include "llglslshader.h" #include "llvoavatarself.h" |